Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yuhao Liu
ogs
Commits
78f60b77
Commit
78f60b77
authored
5 years ago
by
Tom Fischer
Browse files
Options
Downloads
Patches
Plain Diff
[MeL] createSfcElementVector -> copyElementVector.
Use the existing functionality.
parent
cbd16ba8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MeshLib/MeshSurfaceExtraction.cpp
+6
-48
6 additions, 48 deletions
MeshLib/MeshSurfaceExtraction.cpp
with
6 additions
and
48 deletions
MeshLib/MeshSurfaceExtraction.cpp
+
6
−
48
View file @
78f60b77
...
@@ -122,21 +122,6 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh,
...
@@ -122,21 +122,6 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh,
return
true
;
return
true
;
}
}
std
::
vector
<
MeshLib
::
Element
*>
createSfcElementVector
(
std
::
vector
<
MeshLib
::
Element
*>
const
&
sfc_elements
,
std
::
vector
<
MeshLib
::
Node
*>
const
&
sfc_nodes
,
std
::
vector
<
std
::
size_t
>
const
&
node_id_map
)
{
std
::
vector
<
MeshLib
::
Element
*>
new_elements
;
new_elements
.
reserve
(
sfc_elements
.
size
());
for
(
auto
sfc_element
:
sfc_elements
)
{
new_elements
.
push_back
(
MeshLib
::
copyElement
(
sfc_element
,
sfc_nodes
,
&
node_id_map
));
}
return
new_elements
;
}
std
::
tuple
<
std
::
vector
<
MeshLib
::
Node
*>
,
std
::
vector
<
std
::
size_t
>>
std
::
tuple
<
std
::
vector
<
MeshLib
::
Node
*>
,
std
::
vector
<
std
::
size_t
>>
createNodesAndIDMapFromElements
(
std
::
vector
<
MeshLib
::
Element
*>
const
&
elements
,
createNodesAndIDMapFromElements
(
std
::
vector
<
MeshLib
::
Element
*>
const
&
elements
,
std
::
size_t
const
n_all_nodes
)
std
::
size_t
const
n_all_nodes
)
...
@@ -237,23 +222,8 @@ MeshLib::Mesh* MeshSurfaceExtraction::getMeshSurface(
...
@@ -237,23 +222,8 @@ MeshLib::Mesh* MeshSurfaceExtraction::getMeshSurface(
// create new elements vector with newly created nodes (and delete
// create new elements vector with newly created nodes (and delete
// temp-elements)
// temp-elements)
std
::
vector
<
MeshLib
::
Element
*>
new_elements
;
auto
new_elements
=
try
MeshLib
::
copyElementVector
(
sfc_elements
,
sfc_nodes
,
&
node_id_map
);
{
new_elements
=
createSfcElementVector
(
sfc_elements
,
sfc_nodes
,
node_id_map
);
}
catch
(
std
::
runtime_error
const
&
err
)
{
ERR
(
"MeshSurfaceExtraction; could not create new surface "
"elements:
\n
%s."
,
err
.
what
());
std
::
for_each
(
sfc_elements
.
begin
(),
sfc_elements
.
end
(),
[](
MeshLib
::
Element
*
e
)
{
delete
e
;
});
std
::
for_each
(
sfc_nodes
.
begin
(),
sfc_nodes
.
end
(),
[](
MeshLib
::
Node
*
n
)
{
delete
n
;
});
return
nullptr
;
}
std
::
for_each
(
sfc_elements
.
begin
(),
sfc_elements
.
end
(),
std
::
for_each
(
sfc_elements
.
begin
(),
sfc_elements
.
end
(),
[](
MeshLib
::
Element
*
e
)
{
delete
e
;
});
[](
MeshLib
::
Element
*
e
)
{
delete
e
;
});
...
@@ -458,24 +428,12 @@ std::unique_ptr<MeshLib::Mesh> getBoundaryElementsAsMesh(
...
@@ -458,24 +428,12 @@ std::unique_ptr<MeshLib::Mesh> getBoundaryElementsAsMesh(
boundary_elements
,
bulk_mesh
.
getNumberOfNodes
());
boundary_elements
,
bulk_mesh
.
getNumberOfNodes
());
// create new elements using newly created nodes and delete temp-elements
// create new elements using newly created nodes and delete temp-elements
std
::
vector
<
MeshLib
::
Element
*>
new_elements
;
auto
new_elements
=
MeshLib
::
copyElementVector
(
try
boundary_elements
,
boundary_nodes
,
&
node_id_map
);
{
for
(
auto
*
e
:
boundary_elements
)
new_elements
=
createSfcElementVector
(
surface_elements
,
surface_nodes
,
node_id_map
);
}
catch
(
std
::
runtime_error
const
&
err
)
{
{
ERR
(
"BoundaryExtraction; could not create new boundary elements:
\n
%s."
,
delete
e
;
err
.
what
());
std
::
for_each
(
surface_elements
.
begin
(),
surface_elements
.
end
(),
[](
MeshLib
::
Element
*
e
)
{
delete
e
;
});
std
::
for_each
(
surface_nodes
.
begin
(),
surface_nodes
.
end
(),
[](
MeshLib
::
Node
*
n
)
{
delete
n
;
});
return
nullptr
;
}
}
std
::
for_each
(
surface_elements
.
begin
(),
surface_elements
.
end
(),
[](
MeshLib
::
Element
*
e
)
{
delete
e
;
});
std
::
vector
<
std
::
size_t
>
nodes_to_bulk_nodes_id_map
;
std
::
vector
<
std
::
size_t
>
nodes_to_bulk_nodes_id_map
;
nodes_to_bulk_nodes_id_map
.
reserve
(
boundary_nodes
.
size
());
nodes_to_bulk_nodes_id_map
.
reserve
(
boundary_nodes
.
size
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment