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
6d3cf0ea
Commit
6d3cf0ea
authored
16 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
if a "plane" surface has a non-nil geometry then tag the surface as
"ParametricSurface" (not Plane)
parent
9008038e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Geo/GFace.cpp
+6
-7
6 additions, 7 deletions
Geo/GFace.cpp
Geo/gmshFace.cpp
+14
-6
14 additions, 6 deletions
Geo/gmshFace.cpp
benchmarks/misc/adaptive_vector.pos
+0
-20
0 additions, 20 deletions
benchmarks/misc/adaptive_vector.pos
with
20 additions
and
33 deletions
Geo/GFace.cpp
+
6
−
7
View file @
6d3cf0ea
// $Id: GFace.cpp,v 1.6
3
2008-06-03
08:55:33 remacl
e Exp $
// $Id: GFace.cpp,v 1.6
4
2008-06-03
21:39:01 geuzain
e Exp $
//
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
//
...
@@ -387,17 +387,16 @@ end:
...
@@ -387,17 +387,16 @@ end:
Msg
::
Debug
(
"Surface: %d"
,
tag
());
Msg
::
Debug
(
"Surface: %d"
,
tag
());
Msg
::
Debug
(
"SVD : %g,%g,%g (min=%d)"
,
svd
[
0
],
svd
[
1
],
svd
[
2
],
min
);
Msg
::
Debug
(
"SVD : %g,%g,%g (min=%d)"
,
svd
[
0
],
svd
[
1
],
svd
[
2
],
min
);
Msg
::
Debug
(
"Plane : (%g x + %g y + %g z = %g)"
,
Msg
::
Debug
(
"Plane : (%g x + %g y + %g z = %g)"
,
meanPlane
.
a
,
meanPlane
.
b
,
meanPlane
.
c
,
meanPlane
.
d
);
meanPlane
.
a
,
meanPlane
.
b
,
meanPlane
.
c
,
meanPlane
.
d
);
Msg
::
Debug
(
"Normal : (%g , %g , %g )"
,
Msg
::
Debug
(
"Normal : (%g , %g , %g )"
,
meanPlane
.
a
,
meanPlane
.
b
,
meanPlane
.
c
);
meanPlane
.
a
,
meanPlane
.
b
,
meanPlane
.
c
);
Msg
::
Debug
(
"t1 : (%g , %g , %g )"
,
t1
[
0
],
t1
[
1
],
t1
[
2
]);
Msg
::
Debug
(
"t1 : (%g , %g , %g )"
,
t1
[
0
],
t1
[
1
],
t1
[
2
]);
Msg
::
Debug
(
"t2 : (%g , %g , %g )"
,
t2
[
0
],
t2
[
1
],
t2
[
2
]);
Msg
::
Debug
(
"t2 : (%g , %g , %g )"
,
t2
[
0
],
t2
[
1
],
t2
[
2
]);
Msg
::
Debug
(
"pt : (%g , %g , %g )"
,
Msg
::
Debug
(
"pt : (%g , %g , %g )"
,
meanPlane
.
x
,
meanPlane
.
y
,
meanPlane
.
z
);
meanPlane
.
x
,
meanPlane
.
y
,
meanPlane
.
z
);
//check coherence for plane surfaces
//check coherence for plane surfaces
//check commented out because parametric surfaces are not plane in this sense
if
(
geomType
()
==
Plane
)
{
/*if(geomType() == Plane) {
SBoundingBox3d
bb
=
bounds
();
SBoundingBox3d
bb
=
bounds
();
double
lc
=
norm
(
SVector3
(
bb
.
max
(),
bb
.
min
()));
double
lc
=
norm
(
SVector3
(
bb
.
max
(),
bb
.
min
()));
std
::
list
<
GVertex
*>
verts
=
vertices
();
std
::
list
<
GVertex
*>
verts
=
vertices
();
...
@@ -414,7 +413,7 @@ end:
...
@@ -414,7 +413,7 @@ end:
return
;
return
;
}
}
}
}
}
*/
}
#endif
#endif
}
}
...
...
This diff is collapsed.
Click to expand it.
Geo/gmshFace.cpp
+
14
−
6
View file @
6d3cf0ea
// $Id: gmshFace.cpp,v 1.5
6
2008-0
5
-0
4 08:31:14
geuzaine Exp $
// $Id: gmshFace.cpp,v 1.5
7
2008-0
6
-0
3 21:39:01
geuzaine Exp $
//
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
//
...
@@ -224,12 +224,20 @@ SPoint2 gmshFace::parFromPoint(const SPoint3 &qp) const
...
@@ -224,12 +224,20 @@ SPoint2 gmshFace::parFromPoint(const SPoint3 &qp) const
GEntity
::
GeomType
gmshFace
::
geomType
()
const
GEntity
::
GeomType
gmshFace
::
geomType
()
const
{
{
switch
(
s
->
Typ
){
switch
(
s
->
Typ
){
case
MSH_SURF_PLAN
:
return
Plane
;
case
MSH_SURF_PLAN
:
if
(
s
->
geometry
)
return
ParametricSurface
;
else
return
Plane
;
case
MSH_SURF_REGL
:
case
MSH_SURF_REGL
:
case
MSH_SURF_TRIC
:
return
RuledSurface
;
case
MSH_SURF_TRIC
:
case
MSH_SURF_DISCRETE
:
return
DiscreteSurface
;
return
RuledSurface
;
case
MSH_SURF_BND_LAYER
:
return
BoundaryLayerSurface
;
case
MSH_SURF_DISCRETE
:
default:
return
Unknown
;
return
DiscreteSurface
;
case
MSH_SURF_BND_LAYER
:
return
BoundaryLayerSurface
;
default:
return
Unknown
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
benchmarks/misc/adaptive_vector.pos
+
0
−
20
View file @
6d3cf0ea
...
@@ -4,32 +4,12 @@ VQ(0.1,1,0,0,1,0,0,0.8,0,0.1,0.8,0){0,0,0, 0,0,0, 1,0,0, 0,0,0};
...
@@ -4,32 +4,12 @@ VQ(0.1,1,0,0,1,0,0,0.8,0,0.1,0.8,0){0,0,0, 0,0,0, 1,0,0, 0,0,0};
INTERPOLATION_SCHEME
INTERPOLATION_SCHEME
{
{
{.25,-.25,.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,.25,.25},
{.25,-.25,-.25,.25},
{.25,-.25,.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,.25,.25},
{.25,-.25,-.25,.25},
{.25,-.25,.25,-.25},
{.25,-.25,.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,-.25,-.25},
{.25,.25,.25,.25},
{.25,.25,.25,.25},
{.25,-.25,-.25,.25}
{.25,-.25,-.25,.25}
}
}
{
{
{0,0,0},
{1,0,0},
{0,1,0},
{1,1,0},
{0,0,0},
{1,0,0},
{0,1,0},
{1,1,0},
{0,0,0},
{0,0,0},
{1,0,0},
{1,0,0},
{0,1,0},
{0,1,0},
...
...
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