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

Merge pull request #7110 from sloriot/TR-remove_verbose_flag 

Mesh_3, dump_c3t3: remove verbose flag
This commit is contained in:
Laurent Rineau 2022-12-14 10:16:58 +01:00
parent 0d89f3c12b 71e452a6b8
commit 7959549cff
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
View File

@ -40,9 +40,10 @@ template <typename C3t3,
Output_rep<typename C3t3::Subdomain_index>::is_specialized) Output_rep<typename C3t3::Subdomain_index>::is_specialized)
> >
struct Dump_c3t3 { struct Dump_c3t3 {
void dump_c3t3(const C3t3& c3t3, std::string prefix) const void dump_c3t3(const C3t3& c3t3, std::string prefix, bool verbose) const
{ {
std::clog<<"======dump c3t3===== to: " << prefix << std::endl; if (verbose)
std::clog<<"======dump c3t3===== to: " << prefix << std::endl;
std::ofstream medit_file((prefix+".mesh").c_str()); std::ofstream medit_file((prefix+".mesh").c_str());
medit_file.precision(17); medit_file.precision(17);
CGAL::IO::output_to_medit(medit_file, c3t3, false /*rebind*/, true /*show_patches*/); CGAL::IO::output_to_medit(medit_file, c3t3, false /*rebind*/, true /*show_patches*/);
@ -63,7 +64,7 @@ struct Dump_c3t3 {
template <typename C3t3> template <typename C3t3>
struct Dump_c3t3<C3t3, false> struct Dump_c3t3<C3t3, false>
{ {
void dump_c3t3(const C3t3&, std::string) { void dump_c3t3(const C3t3&, std::string, bool) {
std::cerr << "Warning " << __FILE__ << ":" << __LINE__ << "\n" std::cerr << "Warning " << __FILE__ << ":" << __LINE__ << "\n"
<< " the c3t3 object of following type:\n" << " the c3t3 object of following type:\n"
<< typeid(C3t3).name() << std::endl << typeid(C3t3).name() << std::endl
@ -123,11 +124,16 @@ void dump_c3t3_edges(const C3t3& c3t3, std::string prefix)
} }
} }
template <typename C3t3> template <typename C3t3>
void dump_c3t3(const C3t3& c3t3, std::string prefix) void dump_c3t3(const C3t3& c3t3, std::string prefix,
#ifdef CGAL_MESH_3_VERBOSE
bool verbose = true)
#else
bool verbose = false)
#endif
{ {
if(!prefix.empty()) { if(!prefix.empty()) {
Dump_c3t3<C3t3> dump; Dump_c3t3<C3t3> dump;
dump.dump_c3t3(c3t3, prefix); dump.dump_c3t3(c3t3, prefix, verbose);
} }
} }

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

@ -198,7 +198,7 @@ void tetrahedral_isotropic_remeshing(
const SizingFunction& sizing, const SizingFunction& sizing,
const NamedParameters& np) const NamedParameters& np)
{ {
CGAL_assertion(tr.is_valid(true)); CGAL_assertion(tr.is_valid());
typedef CGAL::Triangulation_3<Traits, TDS, SLDS> Tr; typedef CGAL::Triangulation_3<Traits, TDS, SLDS> Tr;
@ -395,7 +395,7 @@ void tetrahedral_isotropic_remeshing(
const SizingFunction& sizing, const SizingFunction& sizing,
const NamedParameters& np) const NamedParameters& np)
{ {
CGAL_assertion(c3t3.triangulation().tds().is_valid(true)); CGAL_assertion(c3t3.triangulation().tds().is_valid());
using parameters::get_parameter; using parameters::get_parameter;
using parameters::choose_parameter; using parameters::choose_parameter;