songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Tetrahedral_remeshing-new-jtournois' of github.com:janetournois/cgal into Tetrahedral_remeshing-new-jtournois

This commit is contained in:
Jane Tournois 2020-04-14 05:41:19 +01:00
parent d5a061a326 608272d2a5
commit 844d7d697a
2 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h
View File

@ -187,13 +187,6 @@ bool is_on_feature(const VertexHandle v)
return (v->in_dimension() == 1 || v->in_dimension() == 0);
}
template<typename Tr>
bool is_well_oriented(const Tr& tr, const typename Tr::Cell_handle ch)
{
return is_well_oriented(tr, ch->vertex(0), ch->vertex(1),
ch->vertex(2), ch->vertex(3));
}
template<typename Tr>
bool is_well_oriented(const Tr& tr,
const typename Tr::Vertex_handle v0,
@ -208,6 +201,13 @@ bool is_well_oriented(const Tr& tr,
point(v3->point()));
}
template<typename Tr>
bool is_well_oriented(const Tr& tr, const typename Tr::Cell_handle ch)
{
return is_well_oriented(tr, ch->vertex(0), ch->vertex(1),
ch->vertex(2), ch->vertex(3));
}
template<typename C3T3, typename CellSelector>
bool is_boundary(const C3T3& c3t3,
const typename C3T3::Facet& f,
@ -683,6 +683,50 @@ bool topology_test(const typename C3t3::Edge& edge,
return true;
}
template<typename C3t3>
Subdomain_relation compare_subdomains(const typename C3t3::Vertex_handle v0,
const typename C3t3::Vertex_handle v1,
const C3t3& c3t3)
{
typedef typename C3t3::Subdomain_index Subdomain_index;
std::vector<Subdomain_index> subdomains_v0;
incident_subdomains(v0, c3t3, std::back_inserter(subdomains_v0));
std::sort(subdomains_v0.begin(), subdomains_v0.end());
std::vector<Subdomain_index> subdomains_v1;
incident_subdomains(v1, c3t3, std::back_inserter(subdomains_v1));
std::sort(subdomains_v1.begin(), subdomains_v1.end());
if (subdomains_v0.size() == subdomains_v1.size())
{
for (unsigned int i = 0; i < subdomains_v0.size(); i++)
if (subdomains_v0[i] != subdomains_v1[i])
return DIFFERENT;
return EQUAL;
}
else
{
std::vector<Subdomain_index>
intersection((std::min)(subdomains_v0.size(), subdomains_v1.size()), -1);
typename std::vector<Subdomain_index>::iterator
end_it = std::set_intersection(subdomains_v0.begin(), subdomains_v0.end(),
subdomains_v1.begin(), subdomains_v1.end(),
intersection.begin());
std::ptrdiff_t intersection_size = (end_it - intersection.begin());
if (subdomains_v0.size() > subdomains_v1.size()
&& intersection_size == std::ptrdiff_t(subdomains_v1.size()))
{
return INCLUDES;
}
else if (intersection_size == std::ptrdiff_t(subdomains_v0.size())) {
return INCLUDED;
}
}
return DIFFERENT;
}
template<typename C3t3, typename CellSelector>
void get_edge_info(const typename C3t3::Edge& edge,
bool& update_v0,
@ -805,51 +849,6 @@ void get_edge_info(const typename C3t3::Edge& edge,
}
}
template<typename C3t3>
Subdomain_relation compare_subdomains(const typename C3t3::Vertex_handle v0,
const typename C3t3::Vertex_handle v1,
const C3t3& c3t3)
{
typedef typename C3t3::Subdomain_index Subdomain_index;
std::vector<Subdomain_index> subdomains_v0;
incident_subdomains(v0, c3t3, std::back_inserter(subdomains_v0));
std::sort(subdomains_v0.begin(), subdomains_v0.end());
std::vector<Subdomain_index> subdomains_v1;
incident_subdomains(v1, c3t3, std::back_inserter(subdomains_v1));
std::sort(subdomains_v1.begin(), subdomains_v1.end());
if (subdomains_v0.size() == subdomains_v1.size())
{
for (unsigned int i = 0; i < subdomains_v0.size(); i++)
if (subdomains_v0[i] != subdomains_v1[i])
return DIFFERENT;
return EQUAL;
}
else
{
std::vector<Subdomain_index>
intersection((std::min)(subdomains_v0.size(), subdomains_v1.size()), -1);
typename std::vector<Subdomain_index>::iterator
end_it = std::set_intersection(subdomains_v0.begin(), subdomains_v0.end(),
subdomains_v1.begin(), subdomains_v1.end(),
intersection.begin());
std::ptrdiff_t intersection_size = (end_it - intersection.begin());
if (subdomains_v0.size() > subdomains_v1.size()
&& intersection_size == std::ptrdiff_t(subdomains_v1.size()))
{
return INCLUDES;
}
else if (intersection_size == std::ptrdiff_t(subdomains_v0.size())) {
return INCLUDED;
}
}
return DIFFERENT;
}
namespace debug
{

2
Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
View File

@ -258,7 +258,7 @@ void tetrahedral_adaptive_remeshing(
{
tetrahedral_adaptive_remeshing(
c3t3,
[target_edge_length](const typename Tr::Point& p)
[target_edge_length](const typename Tr::Point& /* p */)
{return target_edge_length; },
np);
}