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
944b22e3
Commit
944b22e3
authored
18 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
f1e7cef9
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/OCCEdge.cpp
+27
-26
27 additions, 26 deletions
Geo/OCCEdge.cpp
Geo/gmshEdge.cpp
+45
-45
45 additions, 45 deletions
Geo/gmshEdge.cpp
with
72 additions
and
71 deletions
Geo/OCCEdge.cpp
+
27
−
26
View file @
944b22e3
// $Id: OCCEdge.cpp,v 1.
19
2007-0
1-31 12:27:18 remacl
e Exp $
// $Id: OCCEdge.cpp,v 1.
20
2007-0
2-03 00:02:16 geuzain
e Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
...
...
@@ -45,7 +45,7 @@ OCCEdge::OCCEdge(GModel *model, TopoDS_Edge edge, int num, GVertex *v1, GVertex
Range
<
double
>
OCCEdge
::
parBounds
(
int
i
)
const
{
return
(
Range
<
double
>
(
s0
,
s1
)
)
;
return
Range
<
double
>
(
s0
,
s1
);
}
void
OCCEdge
::
setTrimmed
(
OCCFace
*
f
)
...
...
@@ -64,12 +64,10 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const
double
t0
,
t1
;
Handle
(
Geom2d_Curve
)
c2d
;
if
(
dir
==
1
)
{
if
(
dir
==
1
){
c2d
=
BRep_Tool
::
CurveOnSurface
(
c
,
*
s
,
t0
,
t1
);
}
else
{
else
{
c2d
=
BRep_Tool
::
CurveOnSurface
(
c_rev
,
*
s
,
t0
,
t1
);
}
...
...
@@ -90,9 +88,12 @@ SPoint2 OCCEdge::reparamOnFace(GFace *face, double epar,int dir) const
const
double
dz
=
p1
.
z
()
-
p2
.
z
();
if
(
sqrt
(
dx
*
dx
+
dy
*
dy
+
dz
*
dz
)
>
1.e-7
*
CTX
.
lc
){
// return reparamOnFace(face, epar,-1);
Msg
(
WARNING
,
"Reparam on face partially failed for curve %d surface %d at point %g"
,
tag
(),
face
->
tag
(),
epar
);
Msg
(
WARNING
,
"On the face %d local (%g %g) global (%g %g %g)"
,
face
->
tag
(),
u
,
v
,
p2
.
x
(),
p2
.
y
(),
p2
.
z
());
Msg
(
WARNING
,
"On the edge %d local (%g) global (%g %g %g)"
,
tag
(),
epar
,
p1
.
x
(),
p1
.
y
(),
p1
.
z
());
Msg
(
WARNING
,
"Reparam on face partially failed for curve %d surface %d at point %g"
,
tag
(),
face
->
tag
(),
epar
);
Msg
(
WARNING
,
"On the face %d local (%g %g) global (%g %g %g)"
,
face
->
tag
(),
u
,
v
,
p2
.
x
(),
p2
.
y
(),
p2
.
z
());
Msg
(
WARNING
,
"On the edge %d local (%g) global (%g %g %g)"
,
tag
(),
epar
,
p1
.
x
(),
p1
.
y
(),
p1
.
z
());
GPoint
ppp
=
face
->
closestPoint
(
SPoint3
(
p1
.
x
(),
p1
.
y
(),
p1
.
z
()));
return
SPoint2
(
ppp
.
u
(),
ppp
.
v
());
}
...
...
This diff is collapsed.
Click to expand it.
Geo/gmshEdge.cpp
+
45
−
45
View file @
944b22e3
// $Id: gmshEdge.cpp,v 1.2
7
2007-02-0
2 17:16:46 remacl
e Exp $
// $Id: gmshEdge.cpp,v 1.2
8
2007-02-0
3 00:02:16 geuzain
e Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
...
...
@@ -145,15 +145,15 @@ SPoint2 gmshEdge::reparamOnFace(GFace *face, double epar,int dir) const
{
Surface
*
s
=
(
Surface
*
)
face
->
getNativePtr
();
if
(
s
->
geometry
)
{
if
(
s
->
geometry
){
switch
(
c
->
Typ
)
{
case
MSH_SEGM_LINE
:
{
Vertex
*
v
[
3
];
List_Read
(
c
->
Control_Points
,
0
,
&
v
[
1
]);
List_Read
(
c
->
Control_Points
,
1
,
&
v
[
2
]);
SPoint2
p
=
v
[
1
]
->
pntOnGeometry
+
(
v
[
2
]
->
pntOnGeometry
-
v
[
1
]
->
pntOnGeometry
)
*
epar
;
SPoint2
p
=
v
[
1
]
->
pntOnGeometry
+
(
v
[
2
]
->
pntOnGeometry
-
v
[
1
]
->
pntOnGeometry
)
*
epar
;
return
p
;
}
break
;
...
...
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