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
a24f595f
Commit
a24f595f
authored
8 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
missing include (for Wendy and MSVC)
parent
2b134e5d
No related branches found
No related tags found
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Geo/GModelIO_GEO.cpp
+16
-16
16 additions, 16 deletions
Geo/GModelIO_GEO.cpp
Geo/GModelIO_GEO.h
+4
-4
4 additions, 4 deletions
Geo/GModelIO_GEO.h
Parser/Gmsh.l
+1
-0
1 addition, 0 deletions
Parser/Gmsh.l
Parser/Gmsh.yy.cpp
+247
-246
247 additions, 246 deletions
Parser/Gmsh.yy.cpp
with
268 additions
and
266 deletions
Geo/GModelIO_GEO.cpp
+
16
−
16
View file @
a24f595f
...
...
@@ -30,8 +30,8 @@
void
GEO_Internals
::
_allocateAll
()
{
M
axPointNum
=
M
axLineNum
=
M
axLineLoopNum
=
M
axSurfaceNum
=
0
;
M
axSurfaceLoopNum
=
M
axVolumeNum
=
M
axPhysicalNum
=
0
;
_m
axPointNum
=
_m
axLineNum
=
_m
axLineLoopNum
=
_m
axSurfaceNum
=
0
;
_m
axSurfaceLoopNum
=
_m
axVolumeNum
=
_m
axPhysicalNum
=
0
;
Points
=
Tree_Create
(
sizeof
(
Vertex
*
),
CompareVertex
);
Curves
=
Tree_Create
(
sizeof
(
Curve
*
),
CompareCurve
);
...
...
@@ -53,8 +53,8 @@ void GEO_Internals::_allocateAll()
void
GEO_Internals
::
_freeAll
()
{
M
axPointNum
=
M
axLineNum
=
M
axLineLoopNum
=
M
axSurfaceNum
=
0
;
M
axSurfaceLoopNum
=
M
axVolumeNum
=
M
axPhysicalNum
=
0
;
_m
axPointNum
=
_m
axLineNum
=
_m
axLineLoopNum
=
_m
axSurfaceNum
=
0
;
_m
axSurfaceLoopNum
=
_m
axVolumeNum
=
_m
axPhysicalNum
=
0
;
Tree_Action
(
Points
,
FreeVertex
);
Tree_Delete
(
Points
);
Tree_Action
(
Curves
,
FreeCurve
);
Tree_Delete
(
Curves
);
...
...
@@ -77,24 +77,24 @@ void GEO_Internals::_freeAll()
void
GEO_Internals
::
setMaxTag
(
int
dim
,
int
val
)
{
switch
(
dim
){
case
0
:
M
axPointNum
=
val
;
break
;
case
1
:
M
axLineNum
=
val
;
break
;
case
-
1
:
M
axLineLoopNum
=
val
;
break
;
case
2
:
M
axSurfaceNum
=
val
;
break
;
case
-
2
:
M
axSurfaceLoopNum
=
val
;
break
;
case
3
:
M
axVolumeNum
=
val
;
break
;
case
0
:
_m
axPointNum
=
val
;
break
;
case
1
:
_m
axLineNum
=
val
;
break
;
case
-
1
:
_m
axLineLoopNum
=
val
;
break
;
case
2
:
_m
axSurfaceNum
=
val
;
break
;
case
-
2
:
_m
axSurfaceLoopNum
=
val
;
break
;
case
3
:
_m
axVolumeNum
=
val
;
break
;
}
}
int
GEO_Internals
::
getMaxTag
(
int
dim
)
const
{
switch
(
dim
){
case
0
:
return
M
axPointNum
;
case
1
:
return
M
axLineNum
;
case
-
1
:
return
M
axLineLoopNum
;
case
2
:
return
M
axSurfaceNum
;
case
-
2
:
return
M
axSurfaceLoopNum
;
case
3
:
return
M
axVolumeNum
;
case
0
:
return
_m
axPointNum
;
case
1
:
return
_m
axLineNum
;
case
-
1
:
return
_m
axLineLoopNum
;
case
2
:
return
_m
axSurfaceNum
;
case
-
2
:
return
_m
axSurfaceLoopNum
;
case
3
:
return
_m
axVolumeNum
;
default:
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Geo/GModelIO_GEO.h
+
4
−
4
View file @
a24f595f
...
...
@@ -19,8 +19,8 @@ class GEO_Internals{
List_T
*
PhysicalGroups
,
*
DelPhysicalGroups
;
private:
std
::
multimap
<
int
,
std
::
vector
<
int
>
>
_meshCompounds
;
int
M
axPointNum
,
M
axLineNum
,
M
axLineLoopNum
,
M
axSurfaceNum
;
int
M
axSurfaceLoopNum
,
M
axVolumeNum
,
M
axPhysicalNum
;
int
_m
axPointNum
,
_m
axLineNum
,
_m
axLineLoopNum
,
_m
axSurfaceNum
;
int
_m
axSurfaceLoopNum
,
_m
axVolumeNum
,
_m
axPhysicalNum
;
void
_allocateAll
();
void
_freeAll
();
bool
_changed
;
...
...
@@ -80,8 +80,8 @@ class GEO_Internals{
// manipulate physical groups
void
resetPhysicalGroups
();
void
modifyPhysicalGroup
(
int
dim
,
int
num
,
int
op
,
std
::
vector
<
int
>
tags
);
int
getMaxPhysicalTag
()
const
{
return
M
axPhysicalNum
;
}
void
setMaxPhysicalTag
(
int
val
)
{
M
axPhysicalNum
=
val
;
}
int
getMaxPhysicalTag
()
const
{
return
_m
axPhysicalNum
;
}
void
setMaxPhysicalTag
(
int
val
)
{
_m
axPhysicalNum
=
val
;
}
// coherence
void
removeAllDuplicates
();
...
...
This diff is collapsed.
Click to expand it.
Parser/Gmsh.l
+
1
−
0
View file @
a24f595f
...
...
@@ -4,6 +4,7 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@onelab.info>.
#include <algorithm>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
This diff is collapsed.
Click to expand it.
Parser/Gmsh.yy.cpp
+
247
−
246
View file @
a24f595f
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