Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
HexEx
libHexEx
Commits
e4e610a0
Commit
e4e610a0
authored
Jan 27, 2021
by
Max Lyon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cmake-library'
parents
d18d1dda
bc0eed4d
Pipeline
#16644
passed with stage
in 5 minutes and 10 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
4 deletions
+33
-4
cmake-library
cmake-library
+1
-1
src/HexExtractor.cc
src/HexExtractor.cc
+16
-3
src/HexExtractor.hh
src/HexExtractor.hh
+16
-0
No files found.
cmake-library
@
a2fdfb25
Compare
4f4210e0
...
a2fdfb25
Subproject commit
4f4210e0b123b4131dd6952ac359e166c3ab28e6
Subproject commit
a2fdfb2540da7738d84ee56f95dd83628131110d
src/HexExtractor.cc
View file @
e4e610a0
...
...
@@ -2619,6 +2619,12 @@ void HexExtractor::extractTransitionFunction(FaceHandle fh)
}
}
HEXEX_DEBUG_ONLY
(
if
(
min_dist
>
1e-3
)
std
::
cout
<<
"warning, the tranistion function of face "
<<
fh
.
idx
()
<<
" does not seem to "
"belong to the chiral cubical symmetry group G, containing the 24 orientation "
"preserving transformations that map coordinate axes to coordinate axes."
<<
std
::
endl
;
)
auto
u0_t
=
min_transition
.
transform_point
(
u0
);
auto
t
=
roundVector
(
u1
-
u0_t
);
...
...
@@ -2669,7 +2675,14 @@ HexExtractor::CellType HexExtractor::computeCellType(CellHandle ch)
else
if
(
sign
==
ORI_BELOW
)
return
Flipped
;
else
return
Proper
;
return
Proper
;
}
HexExtractor
::
CellType
HexExtractor
::
getCellType
(
CellHandle
ch
)
{
if
(
!
cellTypesComputed
)
computeCellTypes
();
return
cellTypes
[
ch
];
}
void
HexExtractor
::
randomizeParametrization
(
double
offsetSize
,
double
keepBoundary
)
...
...
@@ -4018,8 +4031,8 @@ void HexExtractor::calculateEdgeSingularity(EdgeHandle eh)
std
::
cout
<<
"accumulated tran fun "
<<
std
::
endl
<<
accTranFun
<<
std
::
endl
;
for
(
auto
vh
:
vertices
)
{
std
::
cout
<<
"face 1: "
<<
parameter
(
inputMesh
.
incident_cell
(
transitionFace
),
vh
)
<<
(
isCellFlip
pe
d
(
inputMesh
.
incident_cell
(
transitionFace
))
?
" inverted"
:
" not inverted"
)
<<
std
::
endl
;
std
::
cout
<<
"face 2: "
<<
parameter
(
currentCell
,
vh
)
<<
(
isCellFlip
pe
d
(
currentCell
)
?
" inverted"
:
" not inverted"
)
<<
std
::
endl
;
std
::
cout
<<
"face 1: "
<<
parameter
(
inputMesh
.
incident_cell
(
transitionFace
),
vh
)
<<
" Cell is "
<<
to_string
(
getCellTy
pe
(
inputMesh
.
incident_cell
(
transitionFace
)))
<<
std
::
endl
;
std
::
cout
<<
"face 2: "
<<
parameter
(
currentCell
,
vh
)
<<
" Cell is "
<<
to_string
(
getCellTy
pe
(
currentCell
))
<<
std
::
endl
;
}
...
...
src/HexExtractor.hh
View file @
e4e610a0
...
...
@@ -60,6 +60,21 @@ private:
Degenerate
};
std
::
string
to_string
(
CellType
type
)
{
switch
(
type
)
{
case
NotComputed
:
return
"NotComputed"
;
case
Proper
:
return
"Proper"
;
case
Flipped
:
return
"Flipped"
;
case
Degenerate
:
return
"Degenerate"
;
}
}
public:
HexExtractor
();
...
...
@@ -373,6 +388,7 @@ private:
void
computeCellTypes
();
CellType
computeCellType
(
CellHandle
ch
);
CellType
getCellType
(
CellHandle
ch
);
void
randomizeParametrization
(
double
offsetSize
,
double
keepBoundary
=
false
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment