Commit e4e610a0 authored by Max Lyon's avatar Max Lyon

Merge branch 'cmake-library'

parents d18d1dda bc0eed4d
Pipeline #16644 passed with stage
in 5 minutes and 10 seconds
Subproject commit 4f4210e0b123b4131dd6952ac359e166c3ab28e6
Subproject commit a2fdfb2540da7738d84ee56f95dd83628131110d
......@@ -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) << (isCellFlipped(inputMesh.incident_cell(transitionFace)) ? " inverted" : " not inverted") << std::endl;
std::cout << "face 2: " << parameter(currentCell, vh) << (isCellFlipped(currentCell) ? " inverted" : " not inverted") << std::endl;
std::cout << "face 1: " << parameter(inputMesh.incident_cell(transitionFace), vh) << " Cell is " << to_string(getCellType(inputMesh.incident_cell(transitionFace))) << std::endl;
std::cout << "face 2: " << parameter(currentCell, vh) << " Cell is " << to_string(getCellType(currentCell)) << std::endl;
}
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment