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
d38a637c
Commit
d38a637c
authored
8 years ago
by
Larry Price
Browse files
Options
Downloads
Patches
Plain Diff
Add option logic, fix missing edges
parent
b2b97675
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Common/Gmsh.cpp
+2
-0
2 additions, 0 deletions
Common/Gmsh.cpp
Fltk/classificationEditor.cpp
+0
-3
0 additions, 3 deletions
Fltk/classificationEditor.cpp
Geo/GModel.cpp
+28
-0
28 additions, 0 deletions
Geo/GModel.cpp
with
30 additions
and
3 deletions
Common/Gmsh.cpp
+
2
−
0
View file @
d38a637c
...
@@ -316,6 +316,8 @@ int GmshBatch()
...
@@ -316,6 +316,8 @@ int GmshBatch()
AdaptMesh
(
GModel
::
current
());
AdaptMesh
(
GModel
::
current
());
else
if
(
CTX
::
instance
()
->
batch
==
5
)
else
if
(
CTX
::
instance
()
->
batch
==
5
)
RefineMesh
(
GModel
::
current
(),
CTX
::
instance
()
->
mesh
.
secondOrderLinear
);
RefineMesh
(
GModel
::
current
(),
CTX
::
instance
()
->
mesh
.
secondOrderLinear
);
else
if
(
CTX
::
instance
()
->
batch
==
6
)
GModel
::
current
()
->
classifyAllFaces
();
#if defined(HAVE_CHACO) || defined(HAVE_METIS)
#if defined(HAVE_CHACO) || defined(HAVE_METIS)
if
(
CTX
::
instance
()
->
batchAfterMesh
==
1
){
if
(
CTX
::
instance
()
->
batchAfterMesh
==
1
){
if
(
CTX
::
instance
()
->
partitionOptions
.
num_partitions
>
1
)
if
(
CTX
::
instance
()
->
partitionOptions
.
num_partitions
>
1
)
...
...
This diff is collapsed.
Click to expand it.
Fltk/classificationEditor.cpp
+
0
−
3
View file @
d38a637c
...
@@ -20,9 +20,6 @@
...
@@ -20,9 +20,6 @@
#include
"discreteEdge.h"
#include
"discreteEdge.h"
#include
"discreteFace.h"
#include
"discreteFace.h"
extern
GEdge
*
getNewModelEdge
(
GFace
*
gf1
,
GFace
*
gf2
,
std
::
map
<
std
::
pair
<
int
,
int
>
,
GEdge
*>
&
newEdges
);
static
void
NoElementsSelectedMode
(
classificationEditor
*
e
)
static
void
NoElementsSelectedMode
(
classificationEditor
*
e
)
{
{
e
->
buttons
[
CLASS_BUTTON_SELECT_ELEMENTS
]
->
activate
();
e
->
buttons
[
CLASS_BUTTON_SELECT_ELEMENTS
]
->
activate
();
...
...
This diff is collapsed.
Click to expand it.
Geo/GModel.cpp
+
28
−
0
View file @
d38a637c
...
@@ -3815,11 +3815,39 @@ GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
...
@@ -3815,11 +3815,39 @@ GEdge *getNewModelEdge(GFace *gf1, GFace *gf2,
void
GModel
::
classifyAllFaces
()
void
GModel
::
classifyAllFaces
()
{
{
std
::
set
<
GFace
*>
faces
;
std
::
set
<
GFace
*>
faces
;
std
::
vector
<
MElement
*>
elements
;
for
(
GModel
::
fiter
it
=
this
->
firstFace
();
for
(
GModel
::
fiter
it
=
this
->
firstFace
();
it
!=
this
->
lastFace
();
++
it
)
{
it
!=
this
->
lastFace
();
++
it
)
{
faces
.
insert
(
*
it
);
faces
.
insert
(
*
it
);
elements
.
insert
(
elements
.
end
(),
(
*
it
)
->
triangles
.
begin
(),
(
*
it
)
->
triangles
.
end
());
elements
.
insert
(
elements
.
end
(),
(
*
it
)
->
quadrangles
.
begin
(),
(
*
it
)
->
quadrangles
.
end
());
}
}
discreteEdge
*
edge
=
new
discreteEdge
(
GModel
::
current
(),
GModel
::
current
()
->
getMaxElementaryNumber
(
1
)
+
1
,
0
,
0
);
GModel
::
current
()
->
add
(
edge
);
e2t_cont
adj
;
buildEdgeToElements
(
elements
,
adj
);
std
::
vector
<
edge_angle
>
edges_detected
,
edges_lonly
;
buildListOfEdgeAngle
(
adj
,
edges_detected
,
edges_lonly
);
for
(
unsigned
int
i
=
0
;
i
<
edges_detected
.
size
();
i
++
){
edge_angle
ea
=
edges_detected
[
i
];
if
(
ea
.
angle
<=
0.698132
)
break
;
edge
->
lines
.
push_back
(
new
MLine
(
ea
.
v1
,
ea
.
v2
));
}
this
->
classifyFaces
(
faces
);
this
->
classifyFaces
(
faces
);
GModel
::
current
()
->
remove
(
edge
);
edge
->
lines
.
clear
();
delete
edge
;
elements
.
clear
();
edges_detected
.
clear
();
edges_lonly
.
clear
();
}
}
void
recurClassifyEdges
(
MTri3
*
t
,
std
::
map
<
MTriangle
*
,
GFace
*>
&
reverse
,
void
recurClassifyEdges
(
MTri3
*
t
,
std
::
map
<
MTriangle
*
,
GFace
*>
&
reverse
,
...
...
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