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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
4a28e969
Commit
4a28e969
authored
14 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
more work on createTopology
parent
19b4cf02
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Geo/GModel.cpp
+20
-9
20 additions, 9 deletions
Geo/GModel.cpp
with
20 additions
and
9 deletions
Geo/GModel.cpp
+
20
−
9
View file @
4a28e969
...
@@ -1139,6 +1139,8 @@ void GModel::makeDiscreteFacesSimplyConnected()
...
@@ -1139,6 +1139,8 @@ void GModel::makeDiscreteFacesSimplyConnected()
if
((
*
it
)
->
geomType
()
==
GEntity
::
DiscreteSurface
)
if
((
*
it
)
->
geomType
()
==
GEntity
::
DiscreteSurface
)
discFaces
.
push_back
((
discreteFace
*
)
*
it
);
discFaces
.
push_back
((
discreteFace
*
)
*
it
);
std
::
set
<
MVertex
*>
touched
;
for
(
std
::
vector
<
discreteFace
*>::
iterator
itF
=
discFaces
.
begin
();
for
(
std
::
vector
<
discreteFace
*>::
iterator
itF
=
discFaces
.
begin
();
itF
!=
discFaces
.
end
();
itF
++
){
itF
!=
discFaces
.
end
();
itF
++
){
...
@@ -1162,8 +1164,11 @@ void GModel::makeDiscreteFacesSimplyConnected()
...
@@ -1162,8 +1164,11 @@ void GModel::makeDiscreteFacesSimplyConnected()
e
->
getVertices
(
verts
);
e
->
getVertices
(
verts
);
for
(
unsigned
int
k
=
0
;
k
<
verts
.
size
();
k
++
){
for
(
unsigned
int
k
=
0
;
k
<
verts
.
size
();
k
++
){
if
(
verts
[
k
]
->
onWhat
()
&&
verts
[
k
]
->
onWhat
()
->
dim
()
==
2
){
if
(
verts
[
k
]
->
onWhat
()
&&
verts
[
k
]
->
onWhat
()
->
dim
()
==
2
){
if
(
touched
.
find
(
verts
[
k
])
==
touched
.
end
()){
verts
[
k
]
->
setEntity
(
f
);
verts
[
k
]
->
setEntity
(
f
);
myVertices
.
insert
(
verts
[
k
]);
myVertices
.
insert
(
verts
[
k
]);
touched
.
insert
(
verts
[
k
]);
}
}
}
}
}
MElementFactory
factory
;
MElementFactory
factory
;
...
@@ -1189,8 +1194,6 @@ void GModel::createTopologyFromMesh()
...
@@ -1189,8 +1194,6 @@ void GModel::createTopologyFromMesh()
removeDuplicateMeshVertices
(
CTX
::
instance
()
->
geom
.
tolerance
);
removeDuplicateMeshVertices
(
CTX
::
instance
()
->
geom
.
tolerance
);
makeDiscreteFacesSimplyConnected
();
// create topology for all discrete regions
// create topology for all discrete regions
std
::
vector
<
discreteRegion
*>
discRegions
;
std
::
vector
<
discreteRegion
*>
discRegions
;
for
(
riter
it
=
firstRegion
();
it
!=
lastRegion
();
it
++
)
for
(
riter
it
=
firstRegion
();
it
!=
lastRegion
();
it
++
)
...
@@ -1198,6 +1201,8 @@ void GModel::createTopologyFromMesh()
...
@@ -1198,6 +1201,8 @@ void GModel::createTopologyFromMesh()
discRegions
.
push_back
((
discreteRegion
*
)
*
it
);
discRegions
.
push_back
((
discreteRegion
*
)
*
it
);
createTopologyFromRegions
(
discRegions
);
createTopologyFromRegions
(
discRegions
);
makeDiscreteFacesSimplyConnected
();
// create topology for all discrete faces
// create topology for all discrete faces
std
::
vector
<
discreteFace
*>
discFaces
;
std
::
vector
<
discreteFace
*>
discFaces
;
for
(
fiter
it
=
firstFace
();
it
!=
lastFace
();
it
++
)
for
(
fiter
it
=
firstFace
();
it
!=
lastFace
();
it
++
)
...
@@ -1233,6 +1238,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
...
@@ -1233,6 +1238,7 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
// create reverse map storing for each discrete region the list of
// create reverse map storing for each discrete region the list of
// discrete faces on its boundary
// discrete faces on its boundary
std
::
map
<
int
,
std
::
set
<
int
>
>
region2Faces
;
std
::
map
<
int
,
std
::
set
<
int
>
>
region2Faces
;
std
::
set
<
MVertex
*>
touched
;
while
(
!
map_faces
.
empty
()){
while
(
!
map_faces
.
empty
()){
...
@@ -1302,15 +1308,18 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
...
@@ -1302,15 +1308,18 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
discreteFace
*
f
=
new
discreteFace
(
this
,
numF
);
discreteFace
*
f
=
new
discreteFace
(
this
,
numF
);
add
(
f
);
add
(
f
);
discFaces
.
push_back
(
f
);
discFaces
.
push_back
(
f
);
std
::
set
<
MVertex
*>
allV
;
std
::
set
<
MVertex
*>
myVertices
;
for
(
std
::
set
<
MFace
,
Less_Face
>::
iterator
it
=
myFaces
.
begin
();
for
(
std
::
set
<
MFace
,
Less_Face
>::
iterator
it
=
myFaces
.
begin
();
it
!=
myFaces
.
end
();
it
++
){
it
!=
myFaces
.
end
();
it
++
){
std
::
vector
<
MVertex
*>
verts
(
it
->
getNumVertices
());
std
::
vector
<
MVertex
*>
verts
(
it
->
getNumVertices
());
for
(
int
i
=
0
;
i
<
it
->
getNumVertices
();
i
++
){
for
(
int
i
=
0
;
i
<
it
->
getNumVertices
();
i
++
){
verts
[
i
]
=
it
->
getVertex
(
i
);
verts
[
i
]
=
it
->
getVertex
(
i
);
if
(
verts
[
i
]
->
onWhat
()
&&
verts
[
i
]
->
onWhat
()
->
dim
()
==
3
){
if
(
verts
[
i
]
->
onWhat
()
&&
verts
[
i
]
->
onWhat
()
->
dim
()
==
3
){
allV
.
insert
(
verts
[
i
]);
if
(
touched
.
find
(
verts
[
i
])
!=
touched
.
end
()){
myVertices
.
insert
(
verts
[
i
]);
verts
[
i
]
->
setEntity
(
f
);
verts
[
i
]
->
setEntity
(
f
);
touched
.
insert
(
verts
[
i
]);
}
}
}
}
}
if
(
verts
.
size
()
==
4
)
if
(
verts
.
size
()
==
4
)
...
@@ -1318,14 +1327,16 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
...
@@ -1318,14 +1327,16 @@ void GModel::createTopologyFromRegions(std::vector<discreteRegion*> &discRegions
else
else
f
->
triangles
.
push_back
(
new
MTriangle
(
verts
));
f
->
triangles
.
push_back
(
new
MTriangle
(
verts
));
}
}
f
->
mesh_vertices
.
insert
(
f
->
mesh_vertices
.
begin
(),
allV
.
begin
(),
allV
.
end
());
f
->
mesh_vertices
.
insert
(
f
->
mesh_vertices
.
begin
(),
myVertices
.
begin
(),
myVertices
.
end
());
for
(
std
::
vector
<
int
>::
iterator
itReg
=
tagRegions
.
begin
();
for
(
std
::
vector
<
int
>::
iterator
itReg
=
tagRegions
.
begin
();
itReg
!=
tagRegions
.
end
();
itReg
++
)
{
itReg
!=
tagRegions
.
end
();
itReg
++
)
{
// delete mesh vertices of new edge from adjacent regions
// delete mesh vertices of new edge from adjacent regions
GRegion
*
dReg
=
getRegionByTag
(
*
itReg
);
GRegion
*
dReg
=
getRegionByTag
(
*
itReg
);
for
(
std
::
set
<
MVertex
*>::
iterator
itv
=
allV
.
begin
();
itv
!=
allV
.
end
();
itv
++
)
{
for
(
std
::
set
<
MVertex
*>::
iterator
itv
=
myVertices
.
begin
();
itv
!=
myVertices
.
end
();
itv
++
)
{
std
::
vector
<
MVertex
*>::
iterator
itve
=
std
::
vector
<
MVertex
*>::
iterator
itve
=
std
::
find
(
dReg
->
mesh_vertices
.
begin
(),
dReg
->
mesh_vertices
.
end
(),
*
itv
);
std
::
find
(
dReg
->
mesh_vertices
.
begin
(),
dReg
->
mesh_vertices
.
end
(),
*
itv
);
if
(
itve
!=
dReg
->
mesh_vertices
.
end
())
dReg
->
mesh_vertices
.
erase
(
itve
);
if
(
itve
!=
dReg
->
mesh_vertices
.
end
())
dReg
->
mesh_vertices
.
erase
(
itve
);
...
...
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