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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
5722e68b
Commit
5722e68b
authored
21 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
added sanity check for number of nodes per element
parent
566d5b16
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Mesh/Read_Mesh.cpp
+37
-18
37 additions, 18 deletions
Mesh/Read_Mesh.cpp
with
37 additions
and
18 deletions
Mesh/Read_Mesh.cpp
+
37
−
18
View file @
5722e68b
// $Id: Read_Mesh.cpp,v 1.7
6
2004-0
5-31 01:54:19
geuzaine Exp $
// $Id: Read_Mesh.cpp,v 1.7
7
2004-0
7-01 15:00:23
geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
...
...
@@ -102,6 +102,28 @@ Volume *addElementaryVolume(Mesh * M, int Num)
return
v
;
}
int
getNbrNodes
(
int
Type
)
{
switch
(
Type
)
{
case
PNT
:
return
1
;
case
LGN1
:
return
2
;
case
LGN2
:
return
2
+
1
;
case
TRI1
:
return
3
;
case
TRI2
:
return
3
+
3
;
case
QUA1
:
return
4
;
case
QUA2
:
return
4
+
4
+
1
;
case
TET1
:
return
4
;
case
TET2
:
return
4
+
6
;
case
HEX1
:
return
8
;
case
HEX2
:
return
8
+
12
+
6
+
1
;
case
PRI1
:
return
6
;
case
PRI2
:
return
6
+
9
+
3
;
case
PYR1
:
return
5
;
case
PYR2
:
return
5
+
8
+
1
;
default:
return
0
;
}
}
void
Read_Mesh_MSH
(
Mesh
*
M
,
FILE
*
fp
)
{
char
String
[
256
];
...
...
@@ -221,6 +243,15 @@ void Read_Mesh_MSH(Mesh * M, FILE * fp)
fscanf
(
fp
,
"%d %d %d %d %d"
,
&
Num
,
&
Type
,
&
Physical
,
&
Elementary
,
&
Nbr_Nodes
);
Partition
=
Physical
;
int
Nbr_Nodes_Check
=
getNbrNodes
(
Type
);
if
(
!
Nbr_Nodes_Check
){
Msg
(
GERROR
,
"Unknown type for element %d"
,
Num
);
return
;
}
if
(
Nbr_Nodes
!=
Nbr_Nodes_Check
){
Msg
(
GERROR
,
"Wrong number of nodes for element %d"
,
Num
);
return
;
}
}
else
{
fscanf
(
fp
,
"%d %d %d"
,
&
Num
,
&
Type
,
&
NbTags
);
...
...
@@ -235,22 +266,10 @@ void Read_Mesh_MSH(Mesh * M, FILE * fp)
Partition
=
Tag
;
// ignore any other tags for now
}
switch
(
Type
)
{
case
PNT
:
Nbr_Nodes
=
1
;
break
;
case
LGN1
:
Nbr_Nodes
=
2
;
break
;
case
LGN2
:
Nbr_Nodes
=
2
+
1
;
break
;
case
TRI1
:
Nbr_Nodes
=
3
;
break
;
case
TRI2
:
Nbr_Nodes
=
3
+
3
;
break
;
case
QUA1
:
Nbr_Nodes
=
4
;
break
;
case
QUA2
:
Nbr_Nodes
=
4
+
4
+
1
;
break
;
case
TET1
:
Nbr_Nodes
=
4
;
break
;
case
TET2
:
Nbr_Nodes
=
4
+
6
;
break
;
case
HEX1
:
Nbr_Nodes
=
8
;
break
;
case
HEX2
:
Nbr_Nodes
=
8
+
12
+
6
+
1
;
break
;
case
PRI1
:
Nbr_Nodes
=
6
;
break
;
case
PRI2
:
Nbr_Nodes
=
6
+
9
+
3
;
break
;
case
PYR1
:
Nbr_Nodes
=
5
;
break
;
case
PYR2
:
Nbr_Nodes
=
5
+
8
+
1
;
break
;
Nbr_Nodes
=
getNbrNodes
(
Type
);
if
(
!
Nbr_Nodes
){
Msg
(
GERROR
,
"Unknown type for element %d"
,
Num
);
return
;
}
}
...
...
@@ -436,7 +455,7 @@ void Read_Mesh_MSH(Mesh * M, FILE * fp)
}
break
;
default
:
Msg
(
WARNING
,
"Unknown type
o
f element
in Read_Mesh"
);
Msg
(
GERROR
,
"Unknown type f
or
element
%d"
,
Num
);
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