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
Community
integration-cfmesh
Commits
f0991d90
Commit
f0991d90
authored
Jun 05, 2015
by
Franjo
Browse files
Merge branch 'defect-gapsAtProcessorInterfaces' into developmentPublicRepo
parents
f591f118
7fbe275a
Changes
3
Hide whitespace changes
Inline
Side-by-side
meshLibrary/utilities/meshes/polyMeshGenModifier/polyMeshGenModifierRenumberMesh.C
View file @
f0991d90
...
...
@@ -149,7 +149,7 @@ void polyMeshGenModifier::renumberMesh()
const
cell
&
c
=
newCells
[
cellI
];
//- Record the neighbour cell
labelList
neiCells
(
c
.
size
(),
-
1
);
DynList
<
label
,
24
>
neiCells
(
c
.
size
(),
-
1
);
label
nNeighbours
(
0
);
...
...
meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizer.H
View file @
f0991d90
...
...
@@ -197,7 +197,11 @@ class meshSurfaceOptimizer
);
//- smooth selected points using surface optimizer
void
smoothSurfaceOptimizer
(
const
labelLongList
&
selectedPoints
);
void
smoothSurfaceOptimizer
(
const
labelLongList
&
selectedPoints
,
const
labelLongList
&
selectedProcPoints
);
// Functions needed for parallel runs
...
...
meshLibrary/utilities/smoothers/geometry/meshSurfaceOptimizer/meshSurfaceOptimizerOptimizeSurface.C
View file @
f0991d90
...
...
@@ -161,7 +161,7 @@ void meshSurfaceOptimizer::smoothEdgePoints
const
labelLongList
&
procEdgePoints
)
{
Dyn
List
<
LongList
<
labelledPoint
>
>
newPositions
(
1
);
List
<
LongList
<
labelledPoint
>
>
newPositions
(
1
);
# ifdef USE_OMP
newPositions
.
setSize
(
omp_get_num_procs
());
# endif
...
...
@@ -218,7 +218,7 @@ void meshSurfaceOptimizer::smoothLaplacianFC
const
bool
transform
)
{
Dyn
List
<
LongList
<
labelledPoint
>
>
newPositions
(
1
);
List
<
LongList
<
labelledPoint
>
>
newPositions
(
1
);
# ifdef USE_OMP
newPositions
.
setSize
(
omp_get_num_procs
());
# endif
...
...
@@ -281,7 +281,8 @@ void meshSurfaceOptimizer::smoothLaplacianFC
void
meshSurfaceOptimizer
::
smoothSurfaceOptimizer
(
const
labelLongList
&
selectedPoints
const
labelLongList
&
selectedPoints
,
const
labelLongList
&
selectedProcPoints
)
{
//- create partTriMesh is it is not yet present
...
...
@@ -314,6 +315,10 @@ void meshSurfaceOptimizer::smoothSurfaceOptimizer
surfaceModifier
.
moveBoundaryVertexNoUpdate
(
bpI
,
newPositions
[
i
]);
}
//- ensure that vertices at inter-processor boundaries are at the same
//- location at all processors
surfaceModifier
.
syncVerticesAtParallelBoundaries
(
selectedProcPoints
);
//- update geometry addressing for moved points
surfaceModifier
.
updateGeometry
(
selectedPoints
);
}
...
...
@@ -491,7 +496,7 @@ bool meshSurfaceOptimizer::untangleSurface
surfaceModifier
.
updateGeometry
(
movedPoints
);
//- use surface optimizer
smoothSurfaceOptimizer
(
movedPoints
);
smoothSurfaceOptimizer
(
movedPoints
,
procBndPoints
);
if
(
remapVertex
&&
mapperPtr
)
mapperPtr
->
mapVerticesOntoSurface
(
movedPoints
);
...
...
@@ -503,7 +508,7 @@ bool meshSurfaceOptimizer::untangleSurface
if
(
nInvertedTria
>
0
)
{
//- use the combination with the minimu number of inverted points
//- use the combination with the minimu
m
number of inverted points
meshSurfaceEngineModifier
sMod
(
surfaceEngine_
);
forAll
(
minInvertedPoints
,
bpI
)
sMod
.
moveBoundaryVertexNoUpdate
(
bpI
,
minInvertedPoints
[
bpI
]);
...
...
@@ -640,7 +645,7 @@ void meshSurfaceOptimizer::optimizeSurface(const label nIterations)
{
smoothLaplacianFC
(
partitionPoints
,
procPoints
,
true
);
smoothSurfaceOptimizer
(
partitionPoints
);
smoothSurfaceOptimizer
(
partitionPoints
,
procPoints
);
Info
<<
"."
<<
flush
;
}
...
...
@@ -737,7 +742,7 @@ void meshSurfaceOptimizer::optimizeSurface2D(const label nIterations)
{
Info
<<
"."
<<
flush
;
smoothSurfaceOptimizer
(
movedPoints
);
smoothSurfaceOptimizer
(
movedPoints
,
procBndPoints
);
//- move the points which are not at minimum z coordinate
mesh2DEngine
.
correctPoints
();
...
...
@@ -893,7 +898,7 @@ void meshSurfaceOptimizer::untangleSurface2D()
bMod
.
updateGeometry
(
edgePts
);
smoothSurfaceOptimizer
(
movedPts
);
smoothSurfaceOptimizer
(
movedPts
,
procBndPts
);
bMod
.
updateGeometry
(
movedPts
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment