Skip to content
Snippets Groups Projects
Commit 623fb295 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

- clarify doc of CopyMeshMethod

- make getAdditionInfo display main meshAttributes
parent 0f012c89
No related branches found
No related tags found
No related merge requests found
...@@ -681,7 +681,7 @@ StringXNumber GeometryOptions_Number[] = { ...@@ -681,7 +681,7 @@ StringXNumber GeometryOptions_Number[] = {
{ F, "Clip" , opt_geometry_clip , 0., { F, "Clip" , opt_geometry_clip , 0.,
"Enable clipping planes? (Plane[i]=2^i, i=0,...,5)" }, "Enable clipping planes? (Plane[i]=2^i, i=0,...,5)" },
{ F|O, "CopyMeshingMethod" , opt_geometry_copy_meshing_method, 0. , { F|O, "CopyMeshingMethod" , opt_geometry_copy_meshing_method, 0. ,
"Copy meshing method when duplicating geometrical entities?" }, "Copy meshing method (unstructured or transfinite) when duplicating geometrical entities?" },
{ F|O, "ExactExtrusion" , opt_geometry_exact_extrusion, 1. , { F|O, "ExactExtrusion" , opt_geometry_exact_extrusion, 1. ,
"Use exact extrusion formula in interpolations (set to 0 to allow " "Use exact extrusion formula in interpolations (set to 0 to allow "
......
...@@ -173,6 +173,12 @@ std::string GEdge::getAdditionalInfoString() ...@@ -173,6 +173,12 @@ std::string GEdge::getAdditionalInfoString()
{ {
std::ostringstream sstream; std::ostringstream sstream;
if(v0 && v1) sstream << "{" << v0->tag() << " " << v1->tag() << "}"; if(v0 && v1) sstream << "{" << v0->tag() << " " << v1->tag() << "}";
if(meshAttributes.Method == MESH_TRANSFINITE)
sstream << " transfinite";
if(meshAttributes.extrude)
sstream << " extruded";
return sstream.str(); return sstream.str();
} }
......
...@@ -54,7 +54,8 @@ GFace::~GFace() ...@@ -54,7 +54,8 @@ GFace::~GFace()
int GFace::getCurvatureControlParameter () const int GFace::getCurvatureControlParameter () const
{ {
std::map<int,int>::iterator it = CTX::instance()->mesh.curvature_control_per_face.find(tag()); std::map<int,int>::iterator it =
CTX::instance()->mesh.curvature_control_per_face.find(tag());
return it == CTX::instance()->mesh.curvature_control_per_face.end() ? return it == CTX::instance()->mesh.curvature_control_per_face.end() ?
CTX::instance()->mesh.minCircPoints : it->second ; CTX::instance()->mesh.minCircPoints : it->second ;
} }
...@@ -64,7 +65,6 @@ void GFace::setCurvatureControlParameter (int n) ...@@ -64,7 +65,6 @@ void GFace::setCurvatureControlParameter (int n)
CTX::instance()->mesh.curvature_control_per_face[tag()] = n; CTX::instance()->mesh.curvature_control_per_face[tag()] = n;
} }
int GFace::getMeshingAlgo () const int GFace::getMeshingAlgo () const
{ {
std::map<int,int>::iterator it = CTX::instance()->mesh.algo2d_per_face.find(tag()); std::map<int,int>::iterator it = CTX::instance()->mesh.algo2d_per_face.find(tag());
...@@ -296,6 +296,14 @@ std::string GFace::getAdditionalInfoString() ...@@ -296,6 +296,14 @@ std::string GFace::getAdditionalInfoString()
} }
sstream << "}"; sstream << "}";
} }
if(meshAttributes.recombine)
sstream << " recombined";
if(meshAttributes.Method == MESH_TRANSFINITE)
sstream << " transfinite";
if(meshAttributes.extrude)
sstream << " extruded";
return sstream.str(); return sstream.str();
} }
......
...@@ -217,6 +217,12 @@ std::string GRegion::getAdditionalInfoString() ...@@ -217,6 +217,12 @@ std::string GRegion::getAdditionalInfoString()
} }
sstream << "}"; sstream << "}";
} }
if(meshAttributes.Method == MESH_TRANSFINITE)
sstream << " transfinite";
if(meshAttributes.extrude)
sstream << " extruded";
return sstream.str(); return sstream.str();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment