Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
50b549f3
Commit
50b549f3
authored
Oct 08, 2016
by
Henry Weller
Browse files
blockMesh: rationalizing class and member names
parent
da70f673
Changes
40
Hide whitespace changes
Inline
Side-by-side
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C
View file @
50b549f3
...
...
@@ -115,7 +115,7 @@ void Foam::vtkPV3blockMesh::updateInfoEdges
arrayRangeEdges_
.
reset
(
arraySelection
->
GetNumberOfArrays
()
);
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
curved
EdgeList
&
edges
=
blkMesh
.
edges
();
const
block
EdgeList
&
edges
=
blkMesh
.
edges
();
const
int
nEdges
=
edges
.
size
();
forAll
(
edges
,
edgeI
)
...
...
@@ -429,7 +429,7 @@ void Foam::vtkPV3blockMesh::renderPointNumbers
if
(
show
&&
meshPtr_
)
{
const
pointField
&
cornerPts
=
meshPtr_
->
blockPointField
();
const
pointField
&
cornerPts
=
meshPtr_
->
vertices
();
const
scalar
scaleFactor
=
meshPtr_
->
scaleFactor
();
pointNumberTextActorsPtrs_
.
setSize
(
cornerPts
.
size
());
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C
View file @
50b549f3
...
...
@@ -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
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -55,7 +55,7 @@ void Foam::vtkPV3blockMesh::convertMeshBlocks
label
datasetNo
=
0
;
// restart at dataset 0
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
Foam
::
pointField
&
blockPoints
=
blkMesh
.
blockPointField
();
const
Foam
::
pointField
&
blockPoints
=
blkMesh
.
vertices
();
if
(
debug
)
{
...
...
@@ -148,7 +148,7 @@ void Foam::vtkPV3blockMesh::convertMeshEdges
label
datasetNo
=
0
;
// restart at dataset 0
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
curved
EdgeList
&
edges
=
blkMesh
.
edges
();
const
block
EdgeList
&
edges
=
blkMesh
.
edges
();
int
edgeI
=
0
;
const
scalar
scaleFactor
=
blkMesh
.
scaleFactor
();
...
...
@@ -256,7 +256,7 @@ void Foam::vtkPV3blockMesh::convertMeshCorners
range
.
block
(
blockNo
);
// set output block
label
datasetNo
=
0
;
// restart at dataset 0
const
pointField
&
blockPoints
=
meshPtr_
->
blockPointField
();
const
pointField
&
blockPoints
=
meshPtr_
->
vertices
();
const
scalar
&
scaleFactor
=
meshPtr_
->
scaleFactor
();
if
(
debug
)
...
...
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
View file @
50b549f3
...
...
@@ -115,7 +115,7 @@ void Foam::vtkPVblockMesh::updateInfoEdges
arrayRangeEdges_
.
reset
(
arraySelection
->
GetNumberOfArrays
()
);
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
curved
EdgeList
&
edges
=
blkMesh
.
edges
();
const
block
EdgeList
&
edges
=
blkMesh
.
edges
();
const
int
nEdges
=
edges
.
size
();
forAll
(
edges
,
edgeI
)
...
...
@@ -429,7 +429,7 @@ void Foam::vtkPVblockMesh::renderPointNumbers
if
(
show
&&
meshPtr_
)
{
const
pointField
&
cornerPts
=
meshPtr_
->
blockPointField
();
const
pointField
&
cornerPts
=
meshPtr_
->
vertices
();
const
scalar
scaleFactor
=
meshPtr_
->
scaleFactor
();
pointNumberTextActorsPtrs_
.
setSize
(
cornerPts
.
size
());
...
...
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMeshConvert.C
View file @
50b549f3
...
...
@@ -55,7 +55,7 @@ void Foam::vtkPVblockMesh::convertMeshBlocks
label
datasetNo
=
0
;
// restart at dataset 0
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
Foam
::
pointField
&
blockPoints
=
blkMesh
.
blockPointField
();
const
Foam
::
pointField
&
blockPoints
=
blkMesh
.
vertices
();
if
(
debug
)
{
...
...
@@ -148,7 +148,7 @@ void Foam::vtkPVblockMesh::convertMeshEdges
label
datasetNo
=
0
;
// restart at dataset 0
const
blockMesh
&
blkMesh
=
*
meshPtr_
;
const
curved
EdgeList
&
edges
=
blkMesh
.
edges
();
const
block
EdgeList
&
edges
=
blkMesh
.
edges
();
int
edgeI
=
0
;
const
scalar
scaleFactor
=
blkMesh
.
scaleFactor
();
...
...
@@ -256,7 +256,7 @@ void Foam::vtkPVblockMesh::convertMeshCorners
range
.
block
(
blockNo
);
// set output block
label
datasetNo
=
0
;
// restart at dataset 0
const
pointField
&
blockPoints
=
meshPtr_
->
blockPointField
();
const
pointField
&
blockPoints
=
meshPtr_
->
vertices
();
const
scalar
&
scaleFactor
=
meshPtr_
->
scaleFactor
();
if
(
debug
)
...
...
src/mesh/blockMesh/Make/files
View file @
50b549f3
curved
Edges/BSpline.C
curved
Edges/CatmullRomSpline.C
curved
Edges/polyLine.C
block
Edges/BSpline.C
block
Edges/CatmullRomSpline.C
block
Edges/polyLine.C
curved
Edges/arcEdge.C
curvedEdges/curved
Edge.C
curved
Edges/lineEdge.C
curved
Edges/polyLineEdge.C
curved
Edges/lineDivide.C
curved
Edges/BSplineEdge.C
curved
Edges/splineEdge.C
block
Edges/arcEdge.C
blockEdges/block
Edge.C
block
Edges/lineEdge.C
block
Edges/polyLineEdge.C
block
Edges/lineDivide.C
block
Edges/BSplineEdge.C
block
Edges/splineEdge.C
gradingDescriptor/gradingDescriptor.C
gradingDescriptor/gradingDescriptors.C
...
...
src/mesh/blockMesh/block/block.C
View file @
50b549f3
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -23,20 +23,19 @@ License
\*---------------------------------------------------------------------------*/
#include
"error.H"
#include
"block.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam
::
block
::
block
(
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
edges
,
const
pointField
&
vertices
,
const
block
EdgeList
&
edges
,
Istream
&
is
)
:
blockDescriptor
(
blockPointField
,
edges
,
is
),
vertice
s_
(
0
),
blockDescriptor
(
vertices
,
edges
,
is
),
point
s_
(
0
),
cells_
(
0
),
boundaryPatches_
(
0
)
{}
...
...
@@ -45,7 +44,7 @@ Foam::block::block
Foam
::
block
::
block
(
const
blockDescriptor
&
blockDesc
)
:
blockDescriptor
(
blockDesc
),
vertice
s_
(
0
),
point
s_
(
0
),
cells_
(
0
),
boundaryPatches_
(
0
)
{}
...
...
@@ -61,12 +60,12 @@ Foam::block::~block()
const
Foam
::
pointField
&
Foam
::
block
::
points
()
const
{
if
(
vertice
s_
.
empty
())
if
(
point
s_
.
empty
())
{
createPoints
();
}
return
vertice
s_
;
return
point
s_
;
}
...
...
src/mesh/blockMesh/block/block.H
View file @
50b549f3
...
...
@@ -67,8 +67,8 @@ class block
{
// Private data
//- List of
vertice
s
mutable
pointField
vertice
s_
;
//- List of
point
s
mutable
pointField
point
s_
;
//- List of cells
mutable
labelListList
cells_
;
...
...
@@ -101,9 +101,9 @@ public:
//- Construct from components with Istream
block
(
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
,
Istream
&
const
pointField
&
vertices
,
const
block
EdgeList
&
edges
,
Istream
&
is
);
//- Construct from a block definition
...
...
@@ -116,6 +116,27 @@ public:
return
autoPtr
<
block
>
(
nullptr
);
}
//- Class used for the read-construction of
// PtrLists of blocks
class
iNew
{
const
pointField
&
points_
;
const
blockEdgeList
&
edges_
;
public:
iNew
(
const
pointField
&
points
,
const
blockEdgeList
&
edges
)
:
points_
(
points
),
edges_
(
edges
)
{}
autoPtr
<
block
>
operator
()(
Istream
&
is
)
const
{
return
autoPtr
<
block
>
(
new
block
(
points_
,
edges_
,
is
));
}
};
//- Destructor
~
block
();
...
...
src/mesh/blockMesh/block/blockCreate.C
View file @
50b549f3
...
...
@@ -23,7 +23,6 @@ License
\*---------------------------------------------------------------------------*/
#include
"error.H"
#include
"block.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
...
...
@@ -31,9 +30,9 @@ License
void
Foam
::
block
::
createPoints
()
const
{
// Set local variables for mesh specification
const
label
ni
=
meshD
ensity
().
x
();
const
label
nj
=
meshD
ensity
().
y
();
const
label
nk
=
meshD
ensity
().
z
();
const
label
ni
=
d
ensity
().
x
();
const
label
nj
=
d
ensity
().
y
();
const
label
nk
=
d
ensity
().
z
();
const
point
&
p000
=
blockPoint
(
0
);
const
point
&
p100
=
blockPoint
(
1
);
...
...
@@ -53,8 +52,8 @@ void Foam::block::createPoints() const
//
// Generate vertices
//
vertice
s_
.
clear
();
vertice
s_
.
setSize
(
nPoints
());
point
s_
.
clear
();
point
s_
.
setSize
(
nPoints
());
for
(
label
k
=
0
;
k
<=
nk
;
k
++
)
{
...
...
@@ -218,14 +217,14 @@ void Foam::block::createPoints() const
// Add the contributions
vertice
s_
[
vertexNo
]
=
point
s_
[
vertexNo
]
=
(
edgex1
+
edgex2
+
edgex3
+
edgex4
+
edgey1
+
edgey2
+
edgey3
+
edgey4
+
edgez1
+
edgez2
+
edgez3
+
edgez4
)
/
3
.
0
;
vertice
s_
[
vertexNo
]
+=
point
s_
[
vertexNo
]
+=
(
corx1
+
corx2
+
corx3
+
corx4
+
cory1
+
cory2
+
cory3
+
cory4
...
...
@@ -239,9 +238,9 @@ void Foam::block::createPoints() const
void
Foam
::
block
::
createCells
()
const
{
const
label
ni
=
meshD
ensity
().
x
();
const
label
nj
=
meshD
ensity
().
y
();
const
label
nk
=
meshD
ensity
().
z
();
const
label
ni
=
d
ensity
().
x
();
const
label
nj
=
d
ensity
().
y
();
const
label
nk
=
d
ensity
().
z
();
//
// Generate cells
...
...
@@ -276,9 +275,9 @@ void Foam::block::createCells() const
void
Foam
::
block
::
createBoundary
()
const
{
const
label
ni
=
meshD
ensity
().
x
();
const
label
nj
=
meshD
ensity
().
y
();
const
label
nk
=
meshD
ensity
().
z
();
const
label
ni
=
d
ensity
().
x
();
const
label
nj
=
d
ensity
().
y
();
const
label
nk
=
d
ensity
().
z
();
//
// Generate boundaries on each side of the hex
...
...
@@ -457,7 +456,7 @@ void Foam::block::createBoundary() const
void
Foam
::
block
::
clearGeom
()
{
vertice
s_
.
clear
();
point
s_
.
clear
();
cells_
.
clear
();
boundaryPatches_
.
clear
();
}
...
...
src/mesh/blockMesh/block/blockI.H
View file @
50b549f3
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-201
5
OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-201
6
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -30,8 +30,8 @@ inline Foam::label Foam::block::vtxLabel(label i, label j, label k) const
return
(
i
+
j
*
(
meshD
ensity
().
x
()
+
1
)
+
k
*
(
meshD
ensity
().
x
()
+
1
)
*
(
meshD
ensity
().
y
()
+
1
)
+
j
*
(
d
ensity
().
x
()
+
1
)
+
k
*
(
d
ensity
().
x
()
+
1
)
*
(
d
ensity
().
y
()
+
1
)
);
}
...
...
src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
View file @
50b549f3
...
...
@@ -38,17 +38,17 @@ void Foam::blockDescriptor::check(const Istream& is)
<<
" in block "
<<
*
this
<<
exit
(
FatalIOError
);
}
else
if
(
blockShape_
[
pi
]
>=
blockPointField
_
.
size
())
else
if
(
blockShape_
[
pi
]
>=
vertices
_
.
size
())
{
FatalIOErrorInFunction
(
is
)
<<
"Point label "
<<
blockShape_
[
pi
]
<<
" out of range 0.."
<<
blockPointField
_
.
size
()
-
1
<<
" out of range 0.."
<<
vertices
_
.
size
()
-
1
<<
" in block "
<<
*
this
<<
exit
(
FatalIOError
);
}
}
const
point
blockCentre
(
blockShape_
.
centre
(
blockPointField
_
));
const
point
blockCentre
(
blockShape_
.
centre
(
vertices
_
));
const
faceList
faces
(
blockShape_
.
faces
());
// Check each face is outward-pointing with respect to the block centre
...
...
@@ -57,8 +57,8 @@ void Foam::blockDescriptor::check(const Istream& is)
forAll
(
faces
,
i
)
{
point
faceCentre
(
faces
[
i
].
centre
(
blockPointField
_
));
vector
faceNormal
(
faces
[
i
].
normal
(
blockPointField
_
));
point
faceCentre
(
faces
[
i
].
centre
(
vertices
_
));
vector
faceNormal
(
faces
[
i
].
normal
(
vertices
_
));
if
(
mag
(
faceNormal
)
>
SMALL
)
{
if
(((
faceCentre
-
blockCentre
)
&
faceNormal
)
>
0
)
...
...
@@ -107,17 +107,17 @@ void Foam::blockDescriptor::check(const Istream& is)
Foam
::
blockDescriptor
::
blockDescriptor
(
const
cellShape
&
bshape
,
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
edges
,
const
Vector
<
label
>&
meshD
ensity
,
const
pointField
&
vertices
,
const
block
EdgeList
&
edges
,
const
Vector
<
label
>&
d
ensity
,
const
UList
<
gradingDescriptors
>&
expand
,
const
word
&
zoneName
)
:
blockPointField_
(
blockPointField
),
curvedE
dges_
(
edges
),
vertices_
(
vertices
),
e
dges_
(
edges
),
blockShape_
(
bshape
),
meshD
ensity_
(
meshD
ensity
),
d
ensity_
(
d
ensity
),
edgePoints_
(
12
),
edgeWeights_
(
12
),
expand_
(
expand
),
...
...
@@ -137,15 +137,15 @@ Foam::blockDescriptor::blockDescriptor
Foam
::
blockDescriptor
::
blockDescriptor
(
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
edges
,
const
pointField
&
vertices
,
const
block
EdgeList
&
edges
,
Istream
&
is
)
:
blockPointField_
(
blockPointField
),
curvedE
dges_
(
edges
),
vertices_
(
vertices
),
e
dges_
(
edges
),
blockShape_
(
is
),
meshD
ensity_
(),
d
ensity_
(),
edgePoints_
(
12
),
edgeWeights_
(
12
),
expand_
...
...
@@ -173,7 +173,7 @@ Foam::blockDescriptor::blockDescriptor
// New-style: read a list of 3 values
if
(
t
.
pToken
()
==
token
::
BEGIN_LIST
)
{
is
>>
meshD
ensity_
;
is
>>
d
ensity_
;
}
else
{
...
...
@@ -188,9 +188,9 @@ Foam::blockDescriptor::blockDescriptor
else
{
// Old-style: read three labels
is
>>
meshD
ensity_
.
x
()
>>
meshD
ensity_
.
y
()
>>
meshD
ensity_
.
z
();
is
>>
d
ensity_
.
x
()
>>
d
ensity_
.
y
()
>>
d
ensity_
.
z
();
}
is
>>
t
;
...
...
@@ -250,73 +250,6 @@ Foam::blockDescriptor::~blockDescriptor()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const
Foam
::
pointField
&
Foam
::
blockDescriptor
::
blockPointField
()
const
{
return
blockPointField_
;
}
const
Foam
::
cellShape
&
Foam
::
blockDescriptor
::
blockShape
()
const
{
return
blockShape_
;
}
const
Foam
::
List
<
Foam
::
List
<
Foam
::
point
>>&
Foam
::
blockDescriptor
::
blockEdgePoints
()
const
{
return
edgePoints_
;
}
const
Foam
::
scalarListList
&
Foam
::
blockDescriptor
::
blockEdgeWeights
()
const
{
return
edgeWeights_
;
}
const
Foam
::
Vector
<
Foam
::
label
>&
Foam
::
blockDescriptor
::
meshDensity
()
const
{
return
meshDensity_
;
}
const
Foam
::
word
&
Foam
::
blockDescriptor
::
zoneName
()
const
{
return
zoneName_
;
}
Foam
::
label
Foam
::
blockDescriptor
::
nPoints
()
const
{
return
(
(
meshDensity_
.
x
()
+
1
)
*
(
meshDensity_
.
y
()
+
1
)
*
(
meshDensity_
.
z
()
+
1
)
);
}
Foam
::
label
Foam
::
blockDescriptor
::
nCells
()
const
{
return
(
meshDensity_
.
x
()
*
meshDensity_
.
y
()
*
meshDensity_
.
z
()
);
}
const
Foam
::
point
&
Foam
::
blockDescriptor
::
blockPoint
(
const
label
i
)
const
{
return
blockPointField_
[
blockShape_
[
i
]];
}
// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
Foam
::
Ostream
&
Foam
::
operator
<<
(
Ostream
&
os
,
const
blockDescriptor
&
bd
)
...
...
@@ -341,7 +274,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const blockDescriptor& bd)
os
<<
' '
<<
bd
.
zoneName
();
}
os
<<
' '
<<
bd
.
meshD
ensity
()
os
<<
' '
<<
bd
.
d
ensity
()
<<
" simpleGrading ("
;
...
...
@@ -374,13 +307,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const blockDescriptor& bd)
}
else
{
forAll
(
expand
,
edge
I
)
forAll
(
expand
,
edge
i
)
{
if
(
edge
I
)
if
(
edge
i
)
{
os
<<
' '
;
}
os
<<
expand
[
edge
I
];
os
<<
expand
[
edge
i
];
}
}
...
...
src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
View file @
50b549f3
...
...
@@ -55,7 +55,7 @@ SourceFiles
#include
"cellShape.H"
#include
"pointField.H"
#include
"scalarList.H"
#include
"
curved
EdgeList.H"
#include
"
block
EdgeList.H"
#include
"gradingDescriptors.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -79,16 +79,16 @@ class blockDescriptor
// Private data
//- Reference to point field defining the block mesh
const
pointField
&
blockPointField
_
;
const
pointField
&
vertices
_
;
//- Reference to a list of
curved
edges
const
curved
EdgeList
&
curvedE
dges_
;
//- Reference to a list of
block
edges
const
block
EdgeList
&
e
dges_
;
//- Block shape
cellShape
blockShape_
;
//- The number of cells in the i,j,k directions
Vector
<
label
>
meshD
ensity_
;
Vector
<
label
>
d
ensity_
;
//- Block edge points
List
<
List
<
point
>>
edgePoints_
;
...
...
@@ -99,7 +99,7 @@ class blockDescriptor
//- Expansion ratios in all directions
List
<
gradingDescriptors
>
expand_
;
//- Name of the zone (empty
string
if none)
//- Name of the zone (empty
word
if none)
word
zoneName_
;
...
...
@@ -112,7 +112,7 @@ class blockDescriptor
void
makeBlockEdges
();
//- Set the edge points/weights
void
setEdge
(
label
edge
I
,
label
start
,
label
end
,
label
dim
);
void
setEdge
(
label
edge
i
,
label
start
,
label
end
,
label
dim
);
// Private Member Functions
...
...
@@ -129,9 +129,9 @@ public:
blockDescriptor
(
const
cellShape
&
,
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
,
const
Vector
<
label
>&
meshD
ensity
,
const
pointField
&
vertices
,
const
block
EdgeList
&
,
const
Vector
<
label
>&
d
ensity
,
const
UList
<
gradingDescriptors
>&
expand
,
const
word
&
zoneName
=
""
);
...
...
@@ -139,18 +139,11 @@ public:
//- Construct from Istream
blockDescriptor
(
const
pointField
&
blockPointField
,
const
curved
EdgeList
&
,
const
pointField
&
vertices
,
const
block
EdgeList
&
,
Istream
&
);
//- Clone
autoPtr
<
blockDescriptor
>
clone
()
const
{
NotImplemented
;
return
autoPtr
<
blockDescriptor
>
(
nullptr
);
}