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
683e20d6
Commit
683e20d6
authored
15 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix compile (add default checkTopolgy in GFace)
parent
7ae541ab
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Fltk/graphicWindow.cpp
+1
-0
1 addition, 0 deletions
Fltk/graphicWindow.cpp
Geo/GFace.h
+4
-4
4 additions, 4 deletions
Geo/GFace.h
Geo/OCCFace.h
+0
-1
0 additions, 1 deletion
Geo/OCCFace.h
Geo/discreteFace.h
+0
-1
0 additions, 1 deletion
Geo/discreteFace.h
Geo/gmshFace.h
+0
-1
0 additions, 1 deletion
Geo/gmshFace.h
with
5 additions
and
7 deletions
Fltk/graphicWindow.cpp
+
1
−
0
View file @
683e20d6
...
@@ -481,6 +481,7 @@ graphicWindow::graphicWindow(bool main, int numTiles)
...
@@ -481,6 +481,7 @@ graphicWindow::graphicWindow(bool main, int numTiles)
int
mode
=
FL_RGB
|
FL_DEPTH
|
(
CTX
::
instance
()
->
db
?
FL_DOUBLE
:
FL_SINGLE
);
int
mode
=
FL_RGB
|
FL_DEPTH
|
(
CTX
::
instance
()
->
db
?
FL_DOUBLE
:
FL_SINGLE
);
if
(
CTX
::
instance
()
->
antialiasing
)
mode
|=
FL_MULTISAMPLE
;
if
(
CTX
::
instance
()
->
antialiasing
)
mode
|=
FL_MULTISAMPLE
;
mode
|=
FL_STEREO
;
for
(
unsigned
int
i
=
0
;
i
<
gl
.
size
();
i
++
)
gl
[
i
]
->
mode
(
mode
);
for
(
unsigned
int
i
=
0
;
i
<
gl
.
size
();
i
++
)
gl
[
i
]
->
mode
(
mode
);
tile
->
end
();
tile
->
end
();
...
...
This diff is collapsed.
Click to expand it.
Geo/GFace.h
+
4
−
4
View file @
683e20d6
...
@@ -121,10 +121,10 @@ class GFace : public GEntity
...
@@ -121,10 +121,10 @@ class GFace : public GEntity
// surface. This topological constant can be computed using both the
// surface. This topological constant can be computed using both the
// geometry and the mesh. Both approaches should give the same result ;-)
// geometry and the mesh. Both approaches should give the same result ;-)
// by default, genus is ZERO
// by default, genus is ZERO
int
poincareMesh
();
int
poincareMesh
();
int
genusMesh
()
{
return
(
poincareMesh
()
+
edgeLoops
.
size
()
-
2
)
/
2
;
}
int
genusMesh
()
{
return
(
poincareMesh
()
+
edgeLoops
.
size
()
-
2
)
/
2
;
}
virtual
int
genusGeom
();
virtual
int
genusGeom
();
virtual
bool
checkTopology
()
=
0
;
virtual
bool
checkTopology
()
{
return
true
;
}
// return the point on the face corresponding to the given parameter
// return the point on the face corresponding to the given parameter
virtual
GPoint
point
(
double
par1
,
double
par2
)
const
=
0
;
virtual
GPoint
point
(
double
par1
,
double
par2
)
const
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Geo/OCCFace.h
+
0
−
1
View file @
683e20d6
...
@@ -40,7 +40,6 @@ class OCCFace : public GFace {
...
@@ -40,7 +40,6 @@ class OCCFace : public GFace {
virtual
double
curvatures
(
const
SPoint2
&
param
,
SVector3
*
dirMax
,
SVector3
*
dirMin
,
virtual
double
curvatures
(
const
SPoint2
&
param
,
SVector3
*
dirMax
,
SVector3
*
dirMin
,
double
*
curvMax
,
double
*
curvMin
)
const
;
double
*
curvMax
,
double
*
curvMin
)
const
;
surface_params
getSurfaceParams
()
const
;
surface_params
getSurfaceParams
()
const
;
virtual
bool
checkTopology
()
{
return
true
;};
};
};
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Geo/discreteFace.h
+
0
−
1
View file @
683e20d6
...
@@ -24,7 +24,6 @@ class discreteFace : public GFace {
...
@@ -24,7 +24,6 @@ class discreteFace : public GFace {
SVector3
*
dudu
,
SVector3
*
dvdv
,
SVector3
*
dudv
)
const
;
SVector3
*
dudu
,
SVector3
*
dvdv
,
SVector3
*
dudv
)
const
;
void
setBoundEdges
(
std
::
vector
<
int
>
tagEdges
);
void
setBoundEdges
(
std
::
vector
<
int
>
tagEdges
);
void
findEdges
(
std
::
map
<
MEdge
,
std
::
vector
<
int
>
,
Less_Edge
>
&
map_edges
);
void
findEdges
(
std
::
map
<
MEdge
,
std
::
vector
<
int
>
,
Less_Edge
>
&
map_edges
);
virtual
bool
checkTopology
()
{
return
true
;};
};
};
#endif
#endif
This diff is collapsed.
Click to expand it.
Geo/gmshFace.h
+
0
−
1
View file @
683e20d6
...
@@ -33,7 +33,6 @@ class gmshFace : public GFace {
...
@@ -33,7 +33,6 @@ class gmshFace : public GFace {
void
*
getNativePtr
()
const
{
return
s
;
}
void
*
getNativePtr
()
const
{
return
s
;
}
virtual
SPoint2
parFromPoint
(
const
SPoint3
&
)
const
;
virtual
SPoint2
parFromPoint
(
const
SPoint3
&
)
const
;
virtual
void
resetMeshAttributes
();
virtual
void
resetMeshAttributes
();
virtual
bool
checkTopology
()
{
return
true
;};
};
};
#endif
#endif
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