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

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

Browse Source
This commit is contained in:
william
2014-01-27 15:49:11 +00:00
parent 4abc681d09 f0cec33f88
commit 7be436b503
50 changed files with 256 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshTools.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
@ -315,10 +315,12 @@ void Foam::primitiveMeshTools::cellClosedness
scalar aspectRatio = maxCmpt/(minCmpt + VSMALL);
if (nDims == 3)
{
scalar v = max(VSMALL, vols[cellI]);
aspectRatio = max
(
aspectRatio,
1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(vols[cellI], 2.0/3.0)
1.0/6.0*cmptSum(sumMagClosed[cellI])/pow(v, 2.0/3.0)
);
}

5
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.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
@ -422,7 +422,8 @@ surfaceDisplacementPointPatchVectorField::surfaces() const
IOobject::MUST_READ,
IOobject::NO_WRITE
),
surfacesDict_
surfacesDict_,
true // allow single-region shortcut
)
);
}

5
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.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
@ -399,7 +399,8 @@ surfaceSlipDisplacementPointPatchVectorField::surfaces() const
IOobject::MUST_READ,
IOobject::NO_WRITE
),
surfacesDict_
surfacesDict_,
true // use single region naming shortcut
)
);
}

16
src/meshTools/searchableSurface/searchableSurfaces.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
@ -175,7 +175,8 @@ Foam::searchableSurfaces::searchableSurfaces(const label size)
Foam::searchableSurfaces::searchableSurfaces
(
const IOobject& io,
const dictionary& topDict
const dictionary& topDict,
const bool singleRegionName
)
:
PtrList<searchableSurface>(topDict.size()),
@ -233,9 +234,16 @@ Foam::searchableSurfaces::searchableSurfaces
wordList& rNames = regionNames_[surfI];
rNames.setSize(localNames.size());
forAll(localNames, regionI)
if (singleRegionName && localNames.size() == 1)
{
rNames[regionI] = names_[surfI] + '_' + localNames[regionI];
rNames[0] = names_[surfI];
}
else
{
forAll(localNames, regionI)
{
rNames[regionI] = names_[surfI] + '_' + localNames[regionI];
}
}
// See if dictionary provides any global region names.

14
src/meshTools/searchableSurface/searchableSurfaces.H
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
@ -101,8 +101,16 @@ public:
////- Construct from list of dictionaries
//searchableSurfaces(const IOobject&, const PtrList<dictionary>&);
//- Construct from dictionary
searchableSurfaces(const IOobject&, const dictionary&);
//- Construct from dictionary and whether to construct names always
// as surfaceName "_" regionName (singleRegionName false) or
// for single region surfaces as surfaceName only (singleRegionName
// true)
searchableSurfaces
(
const IOobject&,
const dictionary&,
const bool singleRegionName
);
// Member Functions

6
src/surfMesh/surfaceFormats/obj/OBJstream.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
@ -223,7 +223,7 @@ Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n)
}
Foam::Ostream& Foam::OBJstream::write(const edge& e, const pointField& points)
Foam::Ostream& Foam::OBJstream::write(const edge& e, const UList<point>& points)
{
write(points[e[0]]);
write(points[e[1]]);
@ -290,7 +290,7 @@ Foam::Ostream& Foam::OBJstream::write
Foam::Ostream& Foam::OBJstream::write
(
const face& f,
const pointField& points,
const UList<point>& points,
const bool lines
)
{

6
src/surfMesh/surfaceFormats/obj/OBJstream.H
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
@ -130,7 +130,7 @@ public:
Ostream& write(const point&, const vector&);
//- Write edge as points with line
Ostream& write(const edge&, const pointField&);
Ostream& write(const edge&, const UList<point>&);
//- Write line
Ostream& write(const linePointRef&);
@ -150,7 +150,7 @@ public:
Ostream& write
(
const face&,
const pointField&,
const UList<point>&,
const bool lines = true
);