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
4e09e144
Commit
4e09e144
authored
12 years ago
by
Thomas Toulorge
Browse files
Options
Downloads
Patches
Plain Diff
Fixed generic 3D distortion computation
parent
4ce5c7db
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Geo/MElement.cpp
+12
-6
12 additions, 6 deletions
Geo/MElement.cpp
Mesh/HighOrder.cpp
+2
-2
2 additions, 2 deletions
Mesh/HighOrder.cpp
Mesh/qualityMeasures.cpp
+30
-30
30 additions, 30 deletions
Mesh/qualityMeasures.cpp
with
44 additions
and
38 deletions
Geo/MElement.cpp
+
12
−
6
View file @
4e09e144
...
...
@@ -112,19 +112,25 @@ void MElement::scaledJacRange(double &jmin, double &jmax)
{
jmin
=
jmax
=
1.0
;
#if defined(HAVE_MESH)
// if (getType() == TYPE_PYR) return
;
extern
double
mesh_functional_distorsion
(
MElement
*
,
double
,
double
);
extern
double
mesh_functional_distorsion_2D
(
MElement
*
,
double
,
double
)
;
extern
double
mesh_functional_distorsion
_3D
(
MElement
*
,
double
,
double
,
double
);
if
(
getPolynomialOrder
()
==
1
)
return
;
const
bezierBasis
*
jac
=
getJacobianFuncSpace
()
->
bezier
;
fullVector
<
double
>
Ji
(
jac
->
points
.
size1
());
for
(
int
i
=
0
;
i
<
jac
->
points
.
size1
();
i
++
){
double
u
=
jac
->
points
(
i
,
0
);
double
v
=
jac
->
points
(
i
,
1
);
if
(
getDim
()
==
2
)
{
if
(
getType
()
==
TYPE_QUA
)
{
u
=
-
1
+
2
*
u
;
v
=
-
1
+
2
*
v
;
}
Ji
(
i
)
=
mesh_functional_distorsion
(
this
,
u
,
v
);
Ji
(
i
)
=
mesh_functional_distorsion_2D
(
this
,
u
,
v
);
}
else
{
double
w
=
jac
->
points
(
i
,
2
);
Ji
(
i
)
=
mesh_functional_distorsion_3D
(
this
,
u
,
v
,
w
);
}
}
fullVector
<
double
>
Bi
(
jac
->
matrixLag2Bez
.
size1
()
);
jac
->
matrixLag2Bez
.
mult
(
Ji
,
Bi
);
...
...
This diff is collapsed.
Click to expand it.
Mesh/HighOrder.cpp
+
2
−
2
View file @
4e09e144
...
...
@@ -1325,7 +1325,7 @@ static void checkHighOrderTetrahedron(const char* cc, GModel *m,
avg
/
(
count
?
count
:
1
));
}
extern
double
mesh_functional_distorsion
(
MElement
*
t
,
double
u
,
double
v
);
extern
double
mesh_functional_distorsion
_2D
(
MElement
*
t
,
double
u
,
double
v
);
void
printJacobians
(
GModel
*
m
,
const
char
*
nm
)
{
...
...
@@ -1343,7 +1343,7 @@ void printJacobians(GModel *m, const char *nm)
double
u
=
(
double
)
i
/
(
n
-
1
);
double
v
=
(
double
)
k
/
(
n
-
1
);
t
->
pnt
(
u
,
v
,
0
,
pt
);
D
[
i
][
k
]
=
mesh_functional_distorsion
(
t
,
u
,
v
);
D
[
i
][
k
]
=
mesh_functional_distorsion
_2D
(
t
,
u
,
v
);
//X[i][k] = u;
//Y[i][k] = v;
//Z[i][k] = 0.0;
...
...
This diff is collapsed.
Click to expand it.
Mesh/qualityMeasures.cpp
+
30
−
30
View file @
4e09e144
...
...
@@ -208,7 +208,7 @@ double conditionNumberAndDerivativeOfTet(const double &x1, const double &y1, con
}
*/
double
mesh_functional_distorsion
(
MElement
*
t
,
double
u
,
double
v
)
double
mesh_functional_distorsion
_2D
(
MElement
*
t
,
double
u
,
double
v
)
{
// compute uncurved element jacobian d_u x and d_v x
double
mat
[
3
][
3
];
...
...
@@ -253,25 +253,25 @@ static double MINQ (double a, double b, double c){
double
mesh_functional_distorsion_p2_bezier_refined
(
MTriangle
*
t
)
{
double
J1
=
mesh_functional_distorsion
(
t
,
0.0
,
0.0
);
double
J2
=
mesh_functional_distorsion
(
t
,
1.0
,
0.0
);
double
J3
=
mesh_functional_distorsion
(
t
,
0.0
,
1.0
);
double
J4
=
mesh_functional_distorsion
(
t
,
0.5
,
0.0
);
double
J5
=
mesh_functional_distorsion
(
t
,
0.5
,
0.5
);
double
J6
=
mesh_functional_distorsion
(
t
,
0.0
,
0.5
);
double
J1
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
0.0
);
double
J2
=
mesh_functional_distorsion
_2D
(
t
,
1.0
,
0.0
);
double
J3
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
1.0
);
double
J4
=
mesh_functional_distorsion
_2D
(
t
,
0.5
,
0.0
);
double
J5
=
mesh_functional_distorsion
_2D
(
t
,
0.5
,
0.5
);
double
J6
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
0.5
);
double
J36
=
mesh_functional_distorsion
(
t
,
0.0
,
.75
);
double
J35
=
mesh_functional_distorsion
(
t
,
0.25
,
.75
);
double
J56
=
mesh_functional_distorsion
(
t
,
0.25
,
.5
);
double
J36
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
.75
);
double
J35
=
mesh_functional_distorsion
_2D
(
t
,
0.25
,
.75
);
double
J56
=
mesh_functional_distorsion
_2D
(
t
,
0.25
,
.5
);
double
J16
=
mesh_functional_distorsion
(
t
,
0.0
,
.25
);
double
J14
=
mesh_functional_distorsion
(
t
,
0.25
,
.0
);
double
J46
=
mesh_functional_distorsion
(
t
,
0.25
,
.25
);
double
J16
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
.25
);
double
J14
=
mesh_functional_distorsion
_2D
(
t
,
0.25
,
.0
);
double
J46
=
mesh_functional_distorsion
_2D
(
t
,
0.25
,
.25
);
double
J45
=
mesh_functional_distorsion
(
t
,
0.5
,
.25
);
double
J52
=
mesh_functional_distorsion
(
t
,
0.75
,
.25
);
double
J24
=
mesh_functional_distorsion
(
t
,
0.75
,
.0
);
double
J45
=
mesh_functional_distorsion
_2D
(
t
,
0.5
,
.25
);
double
J52
=
mesh_functional_distorsion
_2D
(
t
,
0.75
,
.25
);
double
J24
=
mesh_functional_distorsion
_2D
(
t
,
0.75
,
.0
);
double
d
[
15
]
=
{
J1
,
J6
,
J4
,
2
*
J16
-
0.5
*
(
J1
+
J6
),
2
*
J14
-
0.5
*
(
J1
+
J4
),
2
*
J46
-
0.5
*
(
J6
+
J4
),
...
...
@@ -282,12 +282,12 @@ double mesh_functional_distorsion_p2_bezier_refined(MTriangle *t)
double
mesh_functional_distorsion_p2_exact
(
MTriangle
*
t
)
{
double
J1
=
mesh_functional_distorsion
(
t
,
0.0
,
0.0
);
double
J2
=
mesh_functional_distorsion
(
t
,
1.0
,
0.0
);
double
J3
=
mesh_functional_distorsion
(
t
,
0.0
,
1.0
);
double
J4
=
mesh_functional_distorsion
(
t
,
0.5
,
0.0
);
double
J5
=
mesh_functional_distorsion
(
t
,
0.5
,
0.5
);
double
J6
=
mesh_functional_distorsion
(
t
,
0.0
,
0.5
);
double
J1
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
0.0
);
double
J2
=
mesh_functional_distorsion
_2D
(
t
,
1.0
,
0.0
);
double
J3
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
1.0
);
double
J4
=
mesh_functional_distorsion
_2D
(
t
,
0.5
,
0.0
);
double
J5
=
mesh_functional_distorsion
_2D
(
t
,
0.5
,
0.5
);
double
J6
=
mesh_functional_distorsion
_2D
(
t
,
0.0
,
0.5
);
const
double
a
=
J1
;
const
double
b
=
-
3
*
J1
-
J2
+
4
*
J4
;
...
...
@@ -347,7 +347,7 @@ double mesh_functional_distorsion_pN(MElement *t)
v
=
-
1
+
2
*
v
;
}
Ji
(
i
)
=
mesh_functional_distorsion
(
t
,
u
,
v
);
Ji
(
i
)
=
mesh_functional_distorsion
_2D
(
t
,
u
,
v
);
}
fullVector
<
double
>
Bi
(
jac
->
matrixLag2Bez
.
size1
()
);
...
...
@@ -406,16 +406,16 @@ double qmDistorsionOfMapping (MQuadrangle *e)
}
static
double
mesh_functional_distorsion
(
MTetrahedron
*
t
,
double
u
,
double
v
,
double
w
)
double
mesh_functional_distorsion
_3D
(
MElement
*
t
,
double
u
,
double
v
,
double
w
)
{
// compute uncurved element jacobian d_u x and d_v x
double
mat
[
3
][
3
];
t
->
getPrimaryJacobian
(
u
,
v
,
w
,
mat
);
const
double
det1
=
det3x3
(
mat
);
t
->
getJacobian
(
u
,
v
,
w
,
mat
);
const
double
detN
=
det3x3
(
mat
);
const
double
det1
=
t
->
getPrimaryJacobian
(
u
,
v
,
w
,
mat
);
//
const double det1 = det3x3(mat);
const
double
detN
=
t
->
getJacobian
(
u
,
v
,
w
,
mat
);
//
const double detN = det3x3(mat);
if
(
det1
==
0
||
detN
==
0
)
return
0
;
double
dist
=
det
1
/
det
N
;
double
dist
=
det
N
/
det
1
;
return
dist
;
}
...
...
@@ -427,7 +427,7 @@ double qmDistorsionOfMapping(MTetrahedron *t)
const
double
u
=
jac
->
points
(
i
,
0
);
const
double
v
=
jac
->
points
(
i
,
1
);
const
double
w
=
jac
->
points
(
i
,
2
);
Ji
(
i
)
=
mesh_functional_distorsion
(
t
,
u
,
v
,
w
);
Ji
(
i
)
=
mesh_functional_distorsion
_3D
(
t
,
u
,
v
,
w
);
}
fullVector
<
double
>
Bi
(
jac
->
matrixLag2Bez
.
size1
()
);
...
...
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