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
Package registry
Model registry
Operate
Terraform modules
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
Romin Tomasetti
gmsh
Commits
f4ae9f10
"README.txt" did not exist on "2f53e983ff6dd8ed8bfaabaf7161242c2a136b2c"
Commit
f4ae9f10
authored
4 years ago
by
Célestin Marot
Browse files
Options
Downloads
Patches
Plain Diff
shouldn't change anything but yields a bug
parent
3e285029
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
contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c
+9
-9
9 additions, 9 deletions
contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c
with
9 additions
and
9 deletions
contrib/hxt/tetMesh/src/hxt_tetDelaunayReshape.c
+
9
−
9
View file @
f4ae9f10
...
@@ -283,7 +283,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
...
@@ -283,7 +283,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
uint64_t
size
=
UINT64_C
(
1
)
<<
u64_log2
(
5
*
numTet
/
2
);
// we want a hash table of at least 2.5*numTet for a good load factor
uint64_t
size
=
UINT64_C
(
1
)
<<
u64_log2
(
5
*
numTet
/
2
);
// we want a hash table of at least 2.5*numTet for a good load factor
uint64_t
mask
=
size
-
1
;
uint64_t
mask
=
size
-
1
;
int64_t
*
faces
;
u
int64_t
*
faces
;
HXTGroup2
*
pairs
;
HXTGroup2
*
pairs
;
HXT_CHECK
(
hxtMalloc
(
&
pairs
,
sizeof
(
HXTGroup2
)
*
size
));
HXT_CHECK
(
hxtMalloc
(
&
pairs
,
sizeof
(
HXTGroup2
)
*
size
));
...
@@ -295,7 +295,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
...
@@ -295,7 +295,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
}
}
// 2.
// 2.
HXT_CHECK
(
hxtMalloc
(
&
faces
,
sizeof
(
int64_t
)
*
4
*
numTet
)
);
HXT_CHECK
(
hxtMalloc
(
&
faces
,
sizeof
(
u
int64_t
)
*
4
*
numTet
)
);
// 3.
// 3.
uint64_t
curFace
=
0
;
uint64_t
curFace
=
0
;
...
@@ -315,7 +315,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
...
@@ -315,7 +315,7 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
else
{
// it should be the next one in the ball, (we didn't change the order since @diggingACavity)
else
{
// it should be the next one in the ball, (we didn't change the order since @diggingACavity)
HXT_ASSERT
(
local
->
ball
.
array
[
curFace
].
neigh
==
neigh
);
HXT_ASSERT
(
local
->
ball
.
array
[
curFace
].
neigh
==
neigh
);
local
->
ball
.
array
[
curFace
].
neigh
=
4
*
i
+
j
;
local
->
ball
.
array
[
curFace
].
neigh
=
4
*
i
+
j
;
faces
[
4
*
i
+
j
]
=
-
curFace
;
// TODO:we probably don't even need to negate it...
faces
[
4
*
i
+
j
]
=
curFace
;
curFace
++
;
curFace
++
;
}
}
}
}
...
@@ -362,14 +362,14 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
...
@@ -362,14 +362,14 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
for
(
int
f
=
0
;
f
<
4
;
f
++
)
{
for
(
int
f
=
0
;
f
<
4
;
f
++
)
{
uint64_t
neigh
=
mesh
->
tetrahedra
.
neigh
[
4
*
tetToUndelete
+
f
];
uint64_t
neigh
=
mesh
->
tetrahedra
.
neigh
[
4
*
tetToUndelete
+
f
];
if
(
!
getDeletedFlag
(
mesh
,
neigh
/
4
))
{
// it is an exterior facet, so we have to remove it from the ball !
if
(
!
getDeletedFlag
(
mesh
,
neigh
/
4
))
{
// it is an exterior facet, so we have to remove it from the ball !
int64_t
face
=
-
faces
[
4
*
(
in
/
4
)
+
f
];
u
int64_t
face
=
faces
[
4
*
(
in
/
4
)
+
f
];
if
(
face
<
curFace
)
{
if
(
face
<
curFace
)
{
curFace
--
;
curFace
--
;
if
(
face
!=
curFace
)
{
if
(
face
!=
curFace
)
{
local
->
ball
.
array
[
face
]
=
local
->
ball
.
array
[
curFace
];
local
->
ball
.
array
[
face
]
=
local
->
ball
.
array
[
curFace
];
uint64_t
inOther
=
local
->
ball
.
array
[
face
].
neigh
;
uint64_t
inOther
=
local
->
ball
.
array
[
face
].
neigh
;
HXT_ASSERT
(
faces
[
inOther
]
==
-
curFace
);
HXT_ASSERT
(
faces
[
inOther
]
==
curFace
);
faces
[
inOther
]
=
-
face
;
faces
[
inOther
]
=
face
;
}
}
face
=
curFace
;
face
=
curFace
;
}
}
...
@@ -379,13 +379,13 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
...
@@ -379,13 +379,13 @@ HXTStatus reshapeCavityIfNeeded(TetLocal* local, HXTMesh* mesh, const uint32_t v
if
(
face
!=
local
->
ball
.
num
)
{
if
(
face
!=
local
->
ball
.
num
)
{
local
->
ball
.
array
[
face
]
=
local
->
ball
.
array
[
local
->
ball
.
num
];
local
->
ball
.
array
[
face
]
=
local
->
ball
.
array
[
local
->
ball
.
num
];
uint64_t
inOther
=
local
->
ball
.
array
[
face
].
neigh
;
uint64_t
inOther
=
local
->
ball
.
array
[
face
].
neigh
;
HXT_ASSERT
(
faces
[
inOther
]
==
-
local
->
ball
.
num
);
HXT_ASSERT
(
faces
[
inOther
]
==
local
->
ball
.
num
);
faces
[
inOther
]
=
-
face
;
faces
[
inOther
]
=
face
;
}
}
}
}
else
{
// we have to add a boundary facet at the end
else
{
// we have to add a boundary facet at the end
uint64_t
out
=
faces
[
4
*
(
in
/
4
)
+
f
];
uint64_t
out
=
faces
[
4
*
(
in
/
4
)
+
f
];
faces
[
out
]
=
-
local
->
ball
.
num
;
faces
[
out
]
=
local
->
ball
.
num
;
uint64_t
*
curNeigh
=
mesh
->
tetrahedra
.
neigh
+
tetToUndelete
*
4
;
uint64_t
*
curNeigh
=
mesh
->
tetrahedra
.
neigh
+
tetToUndelete
*
4
;
...
...
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