Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jennifer Ryan
Nektar
Commits
37923e00
Commit
37923e00
authored
Mar 08, 2017
by
Julian Marcon
Browse files
Response to some MR comments.
parent
78bbc807
Changes
1
Hide whitespace changes
Inline
Side-by-side
library/NekMeshUtils/2DGenerator/2DGenerator.cpp
View file @
37923e00
...
@@ -148,9 +148,6 @@ void Generator2D::Process()
...
@@ -148,9 +148,6 @@ void Generator2D::Process()
m_curvemeshes
[
m_blCurves
[
i
]]
->
Mesh
();
m_curvemeshes
[
m_blCurves
[
i
]]
->
Mesh
();
}
}
LibUtilities
::
AnalyticExpressionEvaluator
bl
;
int
blID
=
bl
.
DefineFunction
(
"x y z"
,
m_config
[
"blthick"
].
as
<
string
>
());
// check curves with adjacent BLs
// check curves with adjacent BLs
for
(
int
i
=
1
;
i
<=
m_mesh
->
m_cad
->
GetNumCurve
();
i
++
)
for
(
int
i
=
1
;
i
<=
m_mesh
->
m_cad
->
GetNumCurve
();
i
++
)
{
{
...
@@ -176,7 +173,8 @@ void Generator2D::Process()
...
@@ -176,7 +173,8 @@ void Generator2D::Process()
if
(
node
->
GetNumCadCurve
())
if
(
node
->
GetNumCadCurve
())
{
{
Array
<
OneD
,
NekDouble
>
loc
=
node
->
GetLoc
();
Array
<
OneD
,
NekDouble
>
loc
=
node
->
GetLoc
();
offset
[
j
]
=
bl
.
Evaluate
(
blID
,
loc
[
0
],
loc
[
1
],
loc
[
2
],
0.0
);
offset
[
j
]
=
m_thickness
.
Evaluate
(
m_thickness_ID
,
loc
[
0
],
loc
[
1
],
loc
[
2
],
0.0
);
}
}
}
}
...
@@ -303,20 +301,7 @@ void Generator2D::Process()
...
@@ -303,20 +301,7 @@ void Generator2D::Process()
if
(
reverse
)
if
(
reverse
)
{
{
vector
<
NodeSharedPtr
>
tmp
;
std
::
reverse
(
++
nnodes
.
begin
(),
--
nnodes
.
end
());
tmp
.
push_back
(
nnodes
.
front
());
for
(
vector
<
NodeSharedPtr
>::
reverse_iterator
rin
=
nnodes
.
rbegin
()
+
1
;
rin
!=
nnodes
.
rend
()
-
1
;
++
rin
)
{
tmp
.
push_back
(
*
rin
);
}
tmp
.
push_back
(
nnodes
.
back
());
nnodes
.
swap
(
tmp
);
}
}
// Clean m_edgeSet and build new CurveMesh
// Clean m_edgeSet and build new CurveMesh
...
@@ -492,6 +477,10 @@ void Generator2D::MakeBL(int faceid)
...
@@ -492,6 +477,10 @@ void Generator2D::MakeBL(int faceid)
ASSERTL0
(
it
->
second
.
size
()
>
0
&&
it
->
second
.
size
()
<
3
,
ASSERTL0
(
it
->
second
.
size
()
>
0
&&
it
->
second
.
size
()
<
3
,
"weirdness, most likely bl_surfs are incorrect"
);
"weirdness, most likely bl_surfs are incorrect"
);
// if node is at the end of a BL curve, the "normal" node is found on
// the adjacent non-BL curve rather than computed through
// perpendicularity
if
(
it
->
second
.
size
()
<
2
)
if
(
it
->
second
.
size
()
<
2
)
{
{
vector
<
pair
<
int
,
CADCurveSharedPtr
>
>
curves
=
vector
<
pair
<
int
,
CADCurveSharedPtr
>
>
curves
=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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