From 623fb2957e374f79687e1a8eb5ad094ad1910cba Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 1 Feb 2013 08:04:24 +0000
Subject: [PATCH] - clarify doc of CopyMeshMethod - make getAdditionInfo
display main meshAttributes
---
Common/DefaultOptions.h | 2 +-
Geo/GEdge.cpp | 6 ++++++
Geo/GFace.cpp | 12 ++++++++++--
Geo/GRegion.cpp | 6 ++++++
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index b7d67d95ef..e21d39d1e4 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -681,7 +681,7 @@ StringXNumber GeometryOptions_Number[] = {
{ F, "Clip" , opt_geometry_clip , 0.,
"Enable clipping planes? (Plane[i]=2^i, i=0,...,5)" },
{ 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. ,
"Use exact extrusion formula in interpolations (set to 0 to allow "
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 76ae91e04c..8be3ec5be8 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -173,6 +173,12 @@ std::string GEdge::getAdditionalInfoString()
{
std::ostringstream sstream;
if(v0 && v1) sstream << "{" << v0->tag() << " " << v1->tag() << "}";
+
+ if(meshAttributes.Method == MESH_TRANSFINITE)
+ sstream << " transfinite";
+ if(meshAttributes.extrude)
+ sstream << " extruded";
+
return sstream.str();
}
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index f28bf72d65..82a10bf31f 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -54,7 +54,8 @@ GFace::~GFace()
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() ?
CTX::instance()->mesh.minCircPoints : it->second ;
}
@@ -64,7 +65,6 @@ void GFace::setCurvatureControlParameter (int n)
CTX::instance()->mesh.curvature_control_per_face[tag()] = n;
}
-
int GFace::getMeshingAlgo () const
{
std::map<int,int>::iterator it = CTX::instance()->mesh.algo2d_per_face.find(tag());
@@ -296,6 +296,14 @@ std::string GFace::getAdditionalInfoString()
}
sstream << "}";
}
+
+ if(meshAttributes.recombine)
+ sstream << " recombined";
+ if(meshAttributes.Method == MESH_TRANSFINITE)
+ sstream << " transfinite";
+ if(meshAttributes.extrude)
+ sstream << " extruded";
+
return sstream.str();
}
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index c77b8edfee..b76724a7ca 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -217,6 +217,12 @@ std::string GRegion::getAdditionalInfoString()
}
sstream << "}";
}
+
+ if(meshAttributes.Method == MESH_TRANSFINITE)
+ sstream << " transfinite";
+ if(meshAttributes.extrude)
+ sstream << " extruded";
+
return sstream.str();
}
--
GitLab