research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
sergio 2014-10-15 12:14:42 +01:00
commit f2ddca6433
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/OpenFOAM/db/IOobject/IOobject.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -48,7 +48,7 @@ defineTypeNameAndDebug(IOobject, 0);
// "foo/bar/" ERROR - no name
// "foo/xxx/bar" ("foo", "xxx", "bar")
// "foo/xxx/yyy/bar" ("foo", "xxx/yyy", "bar")
bool Foam::IOobject::IOobject::fileNameComponents
bool Foam::IOobject::fileNameComponents
(
const fileName& path,
fileName& instance,

6
src/OpenFOAM/db/error/error.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -128,7 +128,7 @@ Foam::OSstream& Foam::error::operator()
}
Foam::error::operator OSstream&()
Foam::error::operator Foam::OSstream&()
{
if (!messageStreamPtr_->good())
{
@ -142,7 +142,7 @@ Foam::error::operator OSstream&()
}
Foam::error::operator dictionary() const
Foam::error::operator Foam::dictionary() const
{
dictionary errDict;

4
src/OpenFOAM/primitives/triad/triad.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -372,7 +372,7 @@ Foam::triad Foam::triad::sortxyz() const
Foam::triad::operator quaternion() const
Foam::triad::operator Foam::quaternion() const
{
tensor R;

4
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/SaffmanMeiLift/SaffmanMeiLiftForce.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,7 @@ Foam::scalar Foam::SaffmanMeiLiftForce<CloudType>::SaffmanMeiLiftForce::Cl
Cld = 6.46*0.0524*sqrt(beta*Re);
}
return 3.0/(mathematical::twoPi*sqrt(Rew))*Cld;
return 3.0/(mathematical::twoPi*sqrt(Rew + ROOTVSMALL))*Cld;
}