Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
85edf9d1
Commit
85edf9d1
authored
8 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix
parent
be910a2e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Geo/GModelCreateTopologyFromMesh.cpp
+17
-17
17 additions, 17 deletions
Geo/GModelCreateTopologyFromMesh.cpp
with
17 additions
and
17 deletions
Geo/GModelCreateTopologyFromMesh.cpp
+
17
−
17
View file @
85edf9d1
...
@@ -231,7 +231,7 @@ std::vector<GEdge*> ensureSimplyConnectedEdge ( GEdge *ge ) {
...
@@ -231,7 +231,7 @@ std::vector<GEdge*> ensureSimplyConnectedEdge ( GEdge *ge ) {
std
::
vector
<
GEdge
*>
_all
;
std
::
vector
<
GEdge
*>
_all
;
std
::
set
<
MLine
*>
_lines
;
std
::
set
<
MLine
*>
_lines
;
std
::
map
<
MVertex
*
,
std
::
pair
<
MLine
*
,
MLine
*>
>
_conn
;
std
::
map
<
MVertex
*
,
std
::
pair
<
MLine
*
,
MLine
*>
>
_conn
;
_all
.
push_back
(
ge
);
_all
.
push_back
(
ge
);
for
(
int
i
=
0
;
i
<
ge
->
lines
.
size
();
i
++
){
for
(
int
i
=
0
;
i
<
ge
->
lines
.
size
();
i
++
){
...
@@ -263,9 +263,9 @@ std::vector<GEdge*> ensureSimplyConnectedEdge ( GEdge *ge ) {
...
@@ -263,9 +263,9 @@ std::vector<GEdge*> ensureSimplyConnectedEdge ( GEdge *ge ) {
else
if
(
it
->
second
.
second
==
l
&&
_lines
.
find
(
it
->
second
.
first
)
!=
_lines
.
end
()){
else
if
(
it
->
second
.
second
==
l
&&
_lines
.
find
(
it
->
second
.
first
)
!=
_lines
.
end
()){
_stack
.
push
(
it
->
second
.
first
);
_stack
.
push
(
it
->
second
.
first
);
}
}
}
}
}
}
_parts
.
push_back
(
_part
);
_parts
.
push_back
(
_part
);
}
}
if
(
_parts
.
size
()
==
1
)
return
_all
;
if
(
_parts
.
size
()
==
1
)
return
_all
;
...
@@ -377,7 +377,7 @@ void createTopologyFromMesh2D ( GModel *gm , int & num) {
...
@@ -377,7 +377,7 @@ void createTopologyFromMesh2D ( GModel *gm , int & num) {
for
(
GModel
::
eiter
it
=
gm
->
firstEdge
();
it
!=
gm
->
lastEdge
();
it
++
)
{
for
(
GModel
::
eiter
it
=
gm
->
firstEdge
();
it
!=
gm
->
lastEdge
();
it
++
)
{
_parts
[
*
it
]
=
ensureSimplyConnectedEdge
(
*
it
);
_parts
[
*
it
]
=
ensureSimplyConnectedEdge
(
*
it
);
}
}
// create Face 2 Edge topology
// create Face 2 Edge topology
{
{
std
::
map
<
GFace
*
,
std
::
set
<
GEdge
*>
>::
iterator
it
=
_topology
.
begin
();
std
::
map
<
GFace
*
,
std
::
set
<
GEdge
*>
>::
iterator
it
=
_topology
.
begin
();
...
@@ -459,13 +459,13 @@ public:
...
@@ -459,13 +459,13 @@ public:
typename
std
::
vector
<
std
::
pair
<
MYFACE
,
T
>
>::
iterator
begin
(
int
i
)
{
return
_data
[
i
].
begin
();}
typename
std
::
vector
<
std
::
pair
<
MYFACE
,
T
>
>::
iterator
begin
(
int
i
)
{
return
_data
[
i
].
begin
();}
typename
std
::
vector
<
std
::
pair
<
MYFACE
,
T
>
>::
iterator
end
(
int
i
)
{
return
_data
[
i
].
end
();}
typename
std
::
vector
<
std
::
pair
<
MYFACE
,
T
>
>::
iterator
end
(
int
i
)
{
return
_data
[
i
].
end
();}
bool
addNoTest
(
const
MYFACE
&
t
,
const
T
&
toAdd
)
{
void
addNoTest
(
const
MYFACE
&
t
,
const
T
&
toAdd
)
{
size_t
h
=
((
size_t
)
t
.
getSortedVertex
(
0
)
>>
8
)
;
size_t
h
=
((
size_t
)
t
.
getSortedVertex
(
0
)
>>
8
)
;
size_t
POS
=
h
%
_data
.
size
();
size_t
POS
=
h
%
_data
.
size
();
_data
[
POS
].
push_back
(
std
::
make_pair
(
t
,
toAdd
));
_data
[
POS
].
push_back
(
std
::
make_pair
(
t
,
toAdd
));
}
}
T
&
find
(
const
MYFACE
&
t
,
bool
&
found
)
{
T
&
find
(
const
MYFACE
&
t
,
bool
&
found
)
{
size_t
h
=
((
size_t
)
t
.
getSortedVertex
(
0
)
>>
8
)
;
size_t
h
=
((
size_t
)
t
.
getSortedVertex
(
0
)
>>
8
)
;
size_t
POS
=
h
%
_data
.
size
();
size_t
POS
=
h
%
_data
.
size
();
...
@@ -475,9 +475,9 @@ public:
...
@@ -475,9 +475,9 @@ public:
found
=
true
;
found
=
true
;
return
v
[
i
].
second
;
return
v
[
i
].
second
;
}
}
}
}
found
=
false
;
found
=
false
;
}
}
};
};
...
@@ -485,7 +485,7 @@ public:
...
@@ -485,7 +485,7 @@ public:
inline
MYFACE
builder
(
MElement
*
e
,
int
num
){
inline
MYFACE
builder
(
MElement
*
e
,
int
num
){
#ifdef _USE_MFACE__
#ifdef _USE_MFACE__
return
e
->
getFace
(
num
);
return
e
->
getFace
(
num
);
#else
#else
if
(
e
->
getType
()
==
TYPE_TET
){
if
(
e
->
getType
()
==
TYPE_TET
){
return
topoFace
(
e
->
getVertex
(
MTetrahedron
::
faces_tetra
(
num
,
0
)),
return
topoFace
(
e
->
getVertex
(
MTetrahedron
::
faces_tetra
(
num
,
0
)),
e
->
getVertex
(
MTetrahedron
::
faces_tetra
(
num
,
1
)),
e
->
getVertex
(
MTetrahedron
::
faces_tetra
(
num
,
1
)),
...
@@ -550,7 +550,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
...
@@ -550,7 +550,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
else
{
else
{
myPair
.
first
=
*
it
;
myPair
.
first
=
*
it
;
}
}
}
}
}
}
}
}
}
}
...
@@ -587,7 +587,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
...
@@ -587,7 +587,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
std
::
vector
<
std
::
pair
<
MYFACE
,
std
::
pair
<
GRegion
*
,
GRegion
*>
>
>
::
iterator
it
=
_temp
.
begin
(
K
);
std
::
vector
<
std
::
pair
<
MYFACE
,
std
::
pair
<
GRegion
*
,
GRegion
*>
>
>
::
iterator
it
=
_temp
.
begin
(
K
);
for
(;
it
!=
_temp
.
end
(
K
);
++
it
)
{
for
(;
it
!=
_temp
.
end
(
K
);
++
it
)
{
if
(
it
->
second
.
first
!=
it
->
second
.
second
){
if
(
it
->
second
.
first
!=
it
->
second
.
second
){
MYFACE
f
=
it
->
first
;
MYFACE
f
=
it
->
first
;
GFace
*
gf
=
_r2f
[
it
->
second
];
GFace
*
gf
=
_r2f
[
it
->
second
];
if
(
f
.
getNumVertices
()
==
3
){
if
(
f
.
getNumVertices
()
==
3
){
MTriangle
*
t
=
new
MTriangle
(
f
.
getVertex
(
0
),
f
.
getVertex
(
1
),
f
.
getVertex
(
2
));
MTriangle
*
t
=
new
MTriangle
(
f
.
getVertex
(
0
),
f
.
getVertex
(
1
),
f
.
getVertex
(
2
));
...
@@ -595,12 +595,12 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
...
@@ -595,12 +595,12 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
}
}
else
if
(
f
.
getNumVertices
()
==
4
){
else
if
(
f
.
getNumVertices
()
==
4
){
MQuadrangle
*
q
=
new
MQuadrangle
(
f
.
getVertex
(
0
),
f
.
getVertex
(
1
),
f
.
getVertex
(
2
),
f
.
getVertex
(
3
));
MQuadrangle
*
q
=
new
MQuadrangle
(
f
.
getVertex
(
0
),
f
.
getVertex
(
1
),
f
.
getVertex
(
2
),
f
.
getVertex
(
3
));
gf
->
quadrangles
.
push_back
(
q
);
gf
->
quadrangles
.
push_back
(
q
);
}
}
}
}
}
}
}
}
// create Regions 2 Faces topology
// create Regions 2 Faces topology
{
{
std
::
map
<
GRegion
*
,
std
::
set
<
GFace
*>
>::
iterator
it
=
_topology
.
begin
();
std
::
map
<
GRegion
*
,
std
::
set
<
GFace
*>
>::
iterator
it
=
_topology
.
begin
();
...
@@ -611,7 +611,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
...
@@ -611,7 +611,7 @@ void createTopologyFromMesh3D ( GModel *gm , int &num ) {
for
(
std
::
list
<
GFace
*>::
iterator
it2
=
l
.
begin
()
;
it2
!=
l
.
end
()
;
++
it2
)(
*
it2
)
->
addRegion
(
it
->
first
);
for
(
std
::
list
<
GFace
*>::
iterator
it2
=
l
.
begin
()
;
it2
!=
l
.
end
()
;
++
it2
)(
*
it2
)
->
addRegion
(
it
->
first
);
}
}
}
}
// NICE :-)
// NICE :-)
}
}
...
@@ -619,7 +619,7 @@ void GModel::createTopologyFromMeshNew ( ) {
...
@@ -619,7 +619,7 @@ void GModel::createTopologyFromMeshNew ( ) {
const
int
dim
=
getDim
();
const
int
dim
=
getDim
();
double
t1
=
Cpu
();
double
t1
=
Cpu
();
if
(
topoExists
(
this
))
{
if
(
topoExists
(
this
))
{
return
;
return
;
}
}
...
@@ -648,5 +648,5 @@ void GModel::createTopologyFromMeshNew ( ) {
...
@@ -648,5 +648,5 @@ void GModel::createTopologyFromMeshNew ( ) {
// printf("%d vertices\n", getNumVertices());
// printf("%d vertices\n", getNumVertices());
double
t2
=
Cpu
();
double
t2
=
Cpu
();
Msg
::
Info
(
"createTopologyFromMeshNew done in %3.f sec.)"
,
t2
-
t1
);
Msg
::
Info
(
"createTopologyFromMeshNew done in %3.f sec.)"
,
t2
-
t1
);
}
}
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