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
64fe3e58
Commit
64fe3e58
authored
19 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
make it possible to add second order vertices for a mesh read from a file (without cad)
parent
5acbde88
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Mesh/DiscreteSurface.cpp
+2
-2
2 additions, 2 deletions
Mesh/DiscreteSurface.cpp
Mesh/Generator.cpp
+9
-9
9 additions, 9 deletions
Mesh/Generator.cpp
Mesh/Mesh.h
+2
-0
2 additions, 0 deletions
Mesh/Mesh.h
Mesh/SecondOrder.cpp
+4
-1
4 additions, 1 deletion
Mesh/SecondOrder.cpp
with
17 additions
and
12 deletions
Mesh/DiscreteSurface.cpp
+
2
−
2
View file @
64fe3e58
// $Id: DiscreteSurface.cpp,v 1.2
7
2005-10-2
4
1
4:09:42 remacl
e Exp $
// $Id: DiscreteSurface.cpp,v 1.2
8
2005-10-2
6
1
5:19:24 geuzain
e Exp $
//
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
//
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
extern
Mesh
*
THEM
;
extern
Mesh
*
THEM
;
extern
Context_T
CTX
;
extern
Context_T
CTX
;
extern
void
Move_SimplexBaseToSimplex
(
Mesh
*
M
,
int
dimension
);
void
Mesh_To_BDS
(
Mesh
*
m
)
void
Mesh_To_BDS
(
Mesh
*
m
)
{
{
...
...
This diff is collapsed.
Click to expand it.
Mesh/Generator.cpp
+
9
−
9
View file @
64fe3e58
// $Id: Generator.cpp,v 1.7
2
2005-10-
1
6 15:
55:46
geuzaine Exp $
// $Id: Generator.cpp,v 1.7
3
2005-10-
2
6 15:
19:24
geuzaine Exp $
//
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
//
...
@@ -238,9 +238,8 @@ void Maillage_Dimension_1(Mesh * M)
...
@@ -238,9 +238,8 @@ void Maillage_Dimension_1(Mesh * M)
t1
=
Cpu
();
t1
=
Cpu
();
Move_SimplexBaseToSimplex
(
M
,
1
);
Tree_Action
(
M
->
Curves
,
Maillage_Curve
);
Tree_Action
(
M
->
Curves
,
Maillage_Curve
);
t2
=
Cpu
();
t2
=
Cpu
();
M
->
timing
[
0
]
=
t2
-
t1
;
M
->
timing
[
0
]
=
t2
-
t1
;
}
}
...
@@ -253,8 +252,6 @@ void Maillage_Dimension_2(Mesh * M)
...
@@ -253,8 +252,6 @@ void Maillage_Dimension_2(Mesh * M)
t1
=
Cpu
();
t1
=
Cpu
();
Move_SimplexBaseToSimplex
(
M
,
2
);
// create reverse 1D meshes
// create reverse 1D meshes
List_T
*
Curves
=
Tree2List
(
M
->
Curves
);
List_T
*
Curves
=
Tree2List
(
M
->
Curves
);
...
@@ -309,8 +306,6 @@ void Maillage_Dimension_3(Mesh * M)
...
@@ -309,8 +306,6 @@ void Maillage_Dimension_3(Mesh * M)
t1
=
Cpu
();
t1
=
Cpu
();
Move_SimplexBaseToSimplex
(
M
,
3
);
// merge all the delaunay parts in a single special volume
// merge all the delaunay parts in a single special volume
v
=
Create_Volume
(
99999
,
99999
);
v
=
Create_Volume
(
99999
,
99999
);
List_T
*
list
=
Tree2List
(
M
->
Volumes
);
List_T
*
list
=
Tree2List
(
M
->
Volumes
);
...
@@ -466,7 +461,7 @@ void mai3d(Mesh * M, int Asked)
...
@@ -466,7 +461,7 @@ void mai3d(Mesh * M, int Asked)
oldstatus
=
M
->
status
;
oldstatus
=
M
->
status
;
//
r
e-read data
//
R
e-read data
if
((
Asked
>
oldstatus
&&
Asked
>=
0
&&
oldstatus
<
0
)
||
if
((
Asked
>
oldstatus
&&
Asked
>=
0
&&
oldstatus
<
0
)
||
(
Asked
<
oldstatus
))
{
(
Asked
<
oldstatus
))
{
...
@@ -476,6 +471,9 @@ void mai3d(Mesh * M, int Asked)
...
@@ -476,6 +471,9 @@ void mai3d(Mesh * M, int Asked)
CTX
.
threads_lock
=
1
;
CTX
.
threads_lock
=
1
;
// Clean up all the 2nd order nodes and transfer all SimplexBase
// into "real" Simplexes
Degre1
();
Degre1
();
// 1D mesh
// 1D mesh
...
@@ -530,11 +528,13 @@ void mai3d(Mesh * M, int Asked)
...
@@ -530,11 +528,13 @@ void mai3d(Mesh * M, int Asked)
if
(
M
->
status
==
3
&&
CTX
.
mesh
.
optimize
)
if
(
M
->
status
==
3
&&
CTX
.
mesh
.
optimize
)
Optimize_Netgen
(
M
);
Optimize_Netgen
(
M
);
//
S
econd order elements
//
Create s
econd order elements
if
(
M
->
status
&&
CTX
.
mesh
.
order
==
2
)
if
(
M
->
status
&&
CTX
.
mesh
.
order
==
2
)
Degre2
(
M
->
status
);
Degre2
(
M
->
status
);
// Partition
if
(
M
->
status
>
1
&&
CTX
.
mesh
.
nbPartitions
!=
1
)
if
(
M
->
status
>
1
&&
CTX
.
mesh
.
nbPartitions
!=
1
)
PartitionMesh
(
M
,
CTX
.
mesh
.
nbPartitions
);
PartitionMesh
(
M
,
CTX
.
mesh
.
nbPartitions
);
...
...
This diff is collapsed.
Click to expand it.
Mesh/Mesh.h
+
2
−
0
View file @
64fe3e58
...
@@ -492,6 +492,8 @@ void Freeze_Vertex(void *a, void *b);
...
@@ -492,6 +492,8 @@ void Freeze_Vertex(void *a, void *b);
void
deFreeze_Vertex
(
void
*
a
,
void
*
b
);
void
deFreeze_Vertex
(
void
*
a
,
void
*
b
);
void
ReOrientSurfaceMesh
(
Surface
*
s
);
void
ReOrientSurfaceMesh
(
Surface
*
s
);
void
Move_SimplexBaseToSimplex
(
Mesh
*
M
,
int
dimension
);
double
Lc_XYZ
(
double
X
,
double
Y
,
double
Z
,
Mesh
*
m
);
double
Lc_XYZ
(
double
X
,
double
Y
,
double
Z
,
Mesh
*
m
);
void
ActionLiss
(
void
*
data
,
void
*
dummy
);
void
ActionLiss
(
void
*
data
,
void
*
dummy
);
void
ActionLissSurf
(
void
*
data
,
void
*
dummy
);
void
ActionLissSurf
(
void
*
data
,
void
*
dummy
);
...
...
This diff is collapsed.
Click to expand it.
Mesh/SecondOrder.cpp
+
4
−
1
View file @
64fe3e58
// $Id: SecondOrder.cpp,v 1.3
3
2005-
05-15 01:44
:2
6
geuzaine Exp $
// $Id: SecondOrder.cpp,v 1.3
4
2005-
10-26 15:19
:2
4
geuzaine Exp $
//
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
//
...
@@ -444,6 +444,9 @@ void ResetDegre2_Volume(void *a, void *b)
...
@@ -444,6 +444,9 @@ void ResetDegre2_Volume(void *a, void *b)
void
Degre1
()
void
Degre1
()
{
{
// transform any SimplexBase into "real" simplices
Move_SimplexBaseToSimplex
(
THEM
,
3
);
// (re-)initialize the global tree of edges/quadfaces
// (re-)initialize the global tree of edges/quadfaces
if
(
edges
)
if
(
edges
)
delete
edges
;
delete
edges
;
...
...
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