diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp index 6799a94a25d28a2f13d31dcde1e50128ac29f70f..c15f629ead80b1bf809726cc230510823bc686a0 100644 --- a/Mesh/Generator.cpp +++ b/Mesh/Generator.cpp @@ -534,8 +534,8 @@ static void Mesh3D(GModel *m) // rec.execute(); Recombinator rec; rec.execute(gr); -// Recombinator_Graph rec; -// rec.execute(1.e7,"test"); +// Recombinator_Graph rec(1.e7,"test"); +// rec.execute(gr); // Supplementary sup; // sup.execute(); // PostOp post; diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp index 83b54b9323a408a4223c99a6bf2f3a0b5d4e7013..5df5c2dd4c7a079effebd5432a8e253531c63c27 100644 --- a/Mesh/yamakawa.cpp +++ b/Mesh/yamakawa.cpp @@ -6164,7 +6164,7 @@ void Recombinator_Graph::buildGraphOnly(GRegion* gr, unsigned int max_nb_cliques -void Recombinator_Graph::execute(unsigned int max_nb_cliques,string filename){ +void Recombinator_Graph::execute(){ GRegion* gr; GModel* model = GModel::current(); GModel::riter it; @@ -6175,7 +6175,7 @@ void Recombinator_Graph::execute(unsigned int max_nb_cliques,string filename){ { gr = *it; if(gr->getNumMeshElements()>0){ - execute(gr, max_nb_cliques,filename); + execute(gr); } } } @@ -6452,8 +6452,10 @@ PETriangle* Recombinator_Graph::get_triangle(MElement *element, int i, int j, in return t; } +Recombinator_Graph::Recombinator_Graph(unsigned int _n,string filename):max_nb_cliques(_n),graphfilename(filename){ +} -void Recombinator_Graph::execute(GRegion* gr, unsigned int max_nb_cliques,string filename){ +void Recombinator_Graph::execute(GRegion* gr){ printf("................HEXAHEDRA................\n"); hex_to_tet.clear(); @@ -6494,9 +6496,9 @@ void Recombinator_Graph::execute(GRegion* gr, unsigned int max_nb_cliques,string int clique_number = 0; - if (filename.empty()) filename.assign("mygraph.dot"); + if (graphfilename.empty()) graphfilename.assign("mygraph.dot"); //export_clique_graphviz_format(cl,1,"mygraph2.dot"); - export_the_clique_graphviz_format(cl,clique_number,filename); + export_the_clique_graphviz_format(cl,clique_number,graphfilename); merge_clique(gr,cl,clique_number); diff --git a/Mesh/yamakawa.h b/Mesh/yamakawa.h index e11f7680b21035110422082c0d371508c4ce4f14..be66e4a094aa0bc0d83be21be9fae8bab4d97d94 100644 --- a/Mesh/yamakawa.h +++ b/Mesh/yamakawa.h @@ -255,14 +255,14 @@ class Tuple{ bool operator<(const Tuple&) const; }; -inline std::ostream& operator<<(std::ostream& s, const PETriangle& t){ - const MVertex *v; - for (int i=0;i<3;i++){ - v = t.getVertex(i); - s << "(" << v->x() << "," << v->y() << "," << v->z() << ")"; - } - return s; -}; +//inline std::ostream& operator<<(std::ostream& s, const PETriangle& t){ +// const MVertex *v; +// for (int i=0;i<3;i++){ +// v = t.getVertex(i); +// s << "(" << v->x() << "," << v->y() << "," << v->z() << ")"; +// } +// return s; +//}; class Recombinator{ protected: @@ -499,10 +499,14 @@ class Recombinator_Graph : public Recombinator{ void export_direct_neighbor_table(int max); void export_hex_init_degree(GRegion *gr, const std::map<Hex*,int> &init_degree, const vector<Hex*> &chosen_hex); + int max_nb_cliques; + string graphfilename; + public: + Recombinator_Graph(unsigned int max_nb_cliques, string filename=string()); ~Recombinator_Graph(); - virtual void execute(unsigned int max_nb_cliques, string filename=string()); - virtual void execute(GRegion*, unsigned int max_nb_cliques, string filename=string()); + virtual void execute(); + virtual void execute(GRegion*); virtual void buildGraphOnly(unsigned int max_nb_cliques, string filename=string()); virtual void buildGraphOnly(GRegion*, unsigned int max_nb_cliques, string filename=string()); virtual void execute_blossom(unsigned int max_nb_cliques, string filename=string()); diff --git a/contrib/Tetgen1.5/tetgen.h b/contrib/Tetgen1.5/tetgen.h index efe504bdf15baa7cdd9be7dc33dd9f7e388ae084..272d77d360f5aafb8ba54bc890397c08fb3474ee 100644 --- a/contrib/Tetgen1.5/tetgen.h +++ b/contrib/Tetgen1.5/tetgen.h @@ -763,7 +763,7 @@ public: delmaxfliplevel = 1; order = 1; reversetetori = 0; - steinerleft = -1; + steinerleft = 0;//-1; no_sort = 0; hilbert_order = 52; //-1; hilbert_limit = 8; @@ -2156,7 +2156,7 @@ public: insegments = 0l; hullsize = 0l; meshedges = meshhulledges = 0l; - steinerleft = -1; + steinerleft = 0;//-1; dupverts = 0l; unuverts = 0l; nonregularcount = 0l;