zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2013-10-25 13:06:06 +01:00
parent ba1bca6c59 9a108cf407
commit cd34e2447f
78 changed files with 3339 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshTools/sets/topoSets/topoSet.C
View File

@ -344,7 +344,7 @@ Foam::topoSet::topoSet
(
mesh.dbDir()/polyMesh::meshSubDir/"sets",
word::null,
IOobject::MUST_READ,
r, //IOobject::MUST_READ,
mesh.facesInstance()
),
polyMesh::meshSubDir/"sets",

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
View File

@ -66,7 +66,11 @@ void thixotropicViscosity::updateMu()
const volScalarField filmMass("filmMass", film.netMass() + mSMALL);
// weighting field to blend new and existing mass contributions
const volScalarField w("w", max(0.0, min(1.0, deltaMass/filmMass)));
const volScalarField w
(
"w",
max(scalar(0.0), min(scalar(1.0), deltaMass/filmMass))
);
// evaluate thixotropic viscosity
volScalarField muThx("muThx", muInf_/(sqr(1.0 - K_*lambda_) + ROOTVSMALL));

6
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,10 +63,10 @@ tmp<scalarField> nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const
scalar uStar = Cmu25*sqrt(k[faceCellI]);
scalar yPlus = uStar*y[faceI]/nuw[faceI];
scalar Edash = (y[faceI] + z0_[faceI])/z0_[faceI];
scalar Edash = (y[faceI] + z0_[faceI])/(z0_[faceI] + 1e-4);
nutw[faceI] =
nuw[faceI]*(yPlus*kappa_/log(max(Edash, 1+1e-4)) - 1);
nuw[faceI]*(yPlus*kappa_/log(max(Edash, 1 + 1e-4)) - 1);
if (debug)
{