diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H index b1770a5a9d56b0b94c6431caf2b1d1adeadf3cb4..33b7943cadd9e1ecb3433927e4e1a5db4fb543df 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H @@ -39,8 +39,6 @@ Description + massSource.SuTot() ); - rhoEqn.relax(); - rhoEqn.solve(); } diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C index 52085f8b694aa5093e32c32a47e53923e51a96b9..c1b4132323ebded70dc7dc3ea56c2cba8d98c3c9 100644 --- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C +++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C @@ -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))) + ) + ); } diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C index 493cb89df693c887ba1760199766983277acae58..57be63e30e790108f5d5b151daad1c6fb4a23690 100644 --- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C +++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.C @@ -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_))); } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution index 48dae067cb1f5d74b838ad535f602657994ef013..5004b930128306b2f5d0e559b3f5c53da0bddb38 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution @@ -77,7 +77,7 @@ PIMPLE relaxationFactors { - "h.* 1; + "h.*" 1; "U.*" 1; } diff --git a/tutorials/incompressible/simpleFoam/motorBike/0.org/U b/tutorials/incompressible/simpleFoam/motorBike/0.org/U index 0e62e1551fe3c11c8c331608c8b26dfe21ad788c..c1fb7eec0af63be41c2ebbc071fc960eb614b660 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/0.org/U +++ b/tutorials/incompressible/simpleFoam/motorBike/0.org/U @@ -35,7 +35,7 @@ boundaryField lowerWall { type fixedValue; - value uniform (20 0 0); + value $internalField; } "motorBike_.*" diff --git a/tutorials/mesh/snappyHexMesh/flange/Allclean b/tutorials/mesh/snappyHexMesh/flange/Allclean index 884d713e5fedd6303575897115ee9c9414fc8d62..abb949539e952db42aa6e3dd4a7c754385a0b406 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allclean +++ b/tutorials/mesh/snappyHexMesh/flange/Allclean @@ -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