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
fc23ebdf
Commit
fc23ebdf
authored
12 years ago
by
Emilie Marchandise
Browse files
Options
Downloads
Patches
Plain Diff
Curvature comments line _isOnBoundary
parent
eecb1ea8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Geo/Curvature.cpp
+17
-30
17 additions, 30 deletions
Geo/Curvature.cpp
benchmarks/curvature/Torus/TorusRemesh.geo
+1
-1
1 addition, 1 deletion
benchmarks/curvature/Torus/TorusRemesh.geo
with
18 additions
and
31 deletions
Geo/Curvature.cpp
+
17
−
30
View file @
fc23ebdf
...
...
@@ -689,23 +689,22 @@ void Curvature::computePointareas(){
const
int
V1
=
_VertexToInt
[
B
->
getNum
()];
const
int
V2
=
_VertexToInt
[
C
->
getNum
()];
if
(
_isOnBoundary
[
V0
])
{
factor
[
0
]
=
1.0
;
}
else
{
factor
[
0
]
=
1.0
;}
if
(
_isOnBoundary
[
V1
])
{
factor
[
1
]
=
1.0
;
}
else
{
factor
[
1
]
=
1.0
;}
// if (_isOnBoundary[V0])
// {
// factor[0] = 1.0;
// }
// else { factor[0] = 1.0;}
// if (_isOnBoundary[V1])
// {
// factor[1] = 1.0;
// }
// else {factor[1] = 1.0;}
if
(
_isOnBoundary
[
V2
])
{
factor
[
2
]
=
1.0
;
}
else
{
factor
[
2
]
=
1.0
;}
//
if (_isOnBoundary[V2])
//
{
//
factor[2] = 1.0;
//
}
//
else {factor[2] = 1.0;}
//Edges
e
[
0
]
=
SVector3
(
C
->
x
()
-
B
->
x
(),
C
->
y
()
-
B
->
y
(),
C
->
z
()
-
B
->
z
());
//vector side of a triangular element
...
...
@@ -1085,7 +1084,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax)
const
int
V2
=
_VertexToInt
[
C
->
getNum
()];
///Set up an initial coordinate system per vertex:
_pdir1
[
V0
]
=
SVector3
(
B
->
x
()
-
A
->
x
(),
B
->
y
()
-
A
->
y
(),
B
->
z
()
-
A
->
z
());
_pdir1
[
V1
]
=
SVector3
(
C
->
x
()
-
B
->
x
(),
C
->
y
()
-
B
->
y
(),
C
->
z
()
-
B
->
z
());
_pdir1
[
V2
]
=
SVector3
(
A
->
x
()
-
C
->
x
(),
A
->
y
()
-
C
->
y
(),
A
->
z
()
-
C
->
z
());
...
...
@@ -1120,8 +1118,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax)
e
[
1
]
=
SVector3
(
A
->
x
()
-
C
->
x
(),
A
->
y
()
-
C
->
y
(),
A
->
z
()
-
C
->
z
());
e
[
2
]
=
SVector3
(
B
->
x
()
-
A
->
x
(),
B
->
y
()
-
A
->
y
(),
B
->
z
()
-
A
->
z
());
//SVector3 e[3] = {SVector3(C->x() - B->x(), C->y() - B->y(), C->z() - B->z()), SVector3(A->x() - C->x(), A->y() - C->y(), A->z() - C->z()), SVector3(B->x() - A->x(), B->y() - A->y(), B->z() - A->z()) };
//N-T-B coordinate system per face
t
=
e
[
0
];
t
.
normalize
();
...
...
@@ -1132,15 +1128,6 @@ void Curvature::computeCurvature_Rusinkiewicz(int isMax)
//Estimate curvature based on variations of normals along edges:
//intialization:
m
=
SVector3
(
0.0
,
0.0
,
0.0
);
//maybe double m[3] = { 0.0, 0.0, 0.0 };
// w *= 0.0; //Reset w to zero
for
(
int
i
=
0
;
i
<
3
;
++
i
)
{
for
(
int
j
=
0
;
j
<
3
;
++
j
)
{
w
(
i
,
j
)
=
0.0
;
}
}
//filling:
for
(
int
j
=
0
;
j
<
3
;
++
j
)
...
...
This diff is collapsed.
Click to expand it.
benchmarks/curvature/Torus/TorusRemesh.geo
+
1
−
1
View file @
fc23ebdf
...
...
@@ -2,7 +2,7 @@
// The following settings were copied from benchmarks/step/linkrods.geo
// ======================================================================
Mesh
.
Algorithm
=
6
;
//1=MeshAdapt, 5=Delaunay, 6=Frontal, 7=bamg
Mesh
.
Algorithm
=
7
;
//1=MeshAdapt, 5=Delaunay, 6=Frontal, 7=bamg
Mesh
.
RemeshParametrization
=
1
;
//(0) harmonic (1) conformal
Mesh
.
RemeshAlgorithm
=
1
;
//(0) nosplit (1) automatic (2) split only with metis ///Default: 1
...
...
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